diff options
| author | John Fastabend <john.r.fastabend@intel.com> | 2010-10-30 16:22:42 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-15 19:11:40 +0100 |
| commit | 636e19a34275d7d6fda0fefa965b1e2a715e2b02 (patch) | |
| tree | 134160c8880adef0d9afc159da22dc577b9fa3c8 /net/8021q/vlanproc.c | |
| parent | net: remove check for headroom in vlan_dev_create (diff) | |
| download | linux-636e19a34275d7d6fda0fefa965b1e2a715e2b02.tar.xz linux-636e19a34275d7d6fda0fefa965b1e2a715e2b02.zip | |
net: consolidate 8021q tagging
Now that VLAN packets are tagged in dev_hard_start_xmit()
at the bottom of the stack we no longer need to tag them
in the 8021Q module (Except in the !VLAN_FLAG_REORDER_HDR
case).
This allows the accel path and non accel paths to be consolidated.
Here the vlan_tci in the skb is always set and we allow the
stack to add the actual tag in dev_hard_start_xmit().
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlanproc.c')
| -rw-r--r-- | net/8021q/vlanproc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index 80e280f56686..8a64db19b8a5 100644 --- a/net/8021q/vlanproc.c +++ b/net/8021q/vlanproc.c @@ -299,10 +299,6 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset) seq_puts(seq, "\n"); seq_printf(seq, fmt64, "total frames transmitted", stats->tx_packets); seq_printf(seq, fmt64, "total bytes transmitted", stats->tx_bytes); - seq_printf(seq, fmt, "total headroom inc", - dev_info->cnt_inc_headroom_on_tx); - seq_printf(seq, fmt, "total encap on xmit", - dev_info->cnt_encap_on_xmit); seq_printf(seq, "Device: %s", dev_info->real_dev->name); /* now show all PRIORITY mappings relating to this VLAN */ seq_printf(seq, "\nINGRESS priority mappings: " |