From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 13 Nov 2009 06:33:11 +0000 (+0000)
Subject: vlan: Use __vlan_hwaccel_put_tag() in rx
X-Git-Tag: v2.6.33-rc1~388^2~340
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b93ab837a2d3eb394082c9eae4ee0a4f83060027;p=pandora-kernel.git

vlan: Use __vlan_hwaccel_put_tag() in rx

Commit 05423b241311c9380 (vlan: allow null VLAN ID to be used)
forgot to update __vlan_hwaccel_rx() & vlan_gro_common()

We need to set VLAN_TAG_PRESENT flag in skb->vlan_tci

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed