vlan: Use __vlan_hwaccel_put_tag() in rx

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Eric Dumazet and committed by

David S. Miller 16 years ago b93ab837 c5d5d172

+2 -2

1 changed file

expand all

net

8021q

vlan_core.c

+2 -2

net/8021q/vlan_core.c

··· 14 14 if (skb_bond_should_drop(skb)) 15 15 goto drop; 16 16 17 - skb->vlan_tci = vlan_tci; 17 + __vlan_hwaccel_put_tag(skb, vlan_tci); 18 18 skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK); 19 19 20 20 if (!skb->dev) ··· 83 83 if (skb_bond_should_drop(skb)) 84 84 goto drop; 85 85 86 - skb->vlan_tci = vlan_tci; 86 + __vlan_hwaccel_put_tag(skb, vlan_tci); 87 87 skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK); 88 88 89 89 if (!skb->dev)