net: consolidate 8021q tagging
authorJohn Fastabend <john.r.fastabend@intel.com>
Sat, 30 Oct 2010 14:22:42 +0000 (14:22 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 15 Nov 2010 18:11:40 +0000 (10:11 -0800)
commit636e19a34275d7d6fda0fefa965b1e2a715e2b02
tree134160c8880adef0d9afc159da22dc577b9fa3c8
parent8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e
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>
net/8021q/vlan.h
net/8021q/vlan_dev.c
net/8021q/vlanproc.c