From: John Fastabend <john.r.fastabend@intel.com>
Date: Sat, 30 Oct 2010 14:22:42 +0000 (+0000)
Subject: net: consolidate 8021q tagging
X-Git-Tag: v2.6.38-rc1~476^2~581
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=636e19a34275d7d6fda0fefa965b1e2a715e2b02;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed