vlan: Use __vlan_hwaccel_put_tag() in rx
Eric Dumazet [Fri, 13 Nov 2009 06:33:11 +0000 (06:33 +0000)]
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>

net/8021q/vlan_core.c

index 8d5ca2a..971d375 100644 (file)
@@ -14,7 +14,7 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
        if (skb_bond_should_drop(skb))
                goto drop;
 
-       skb->vlan_tci = vlan_tci;
+       __vlan_hwaccel_put_tag(skb, vlan_tci);
        skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
 
        if (!skb->dev)
@@ -83,7 +83,7 @@ vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp,
        if (skb_bond_should_drop(skb))
                goto drop;
 
-       skb->vlan_tci = vlan_tci;
+       __vlan_hwaccel_put_tag(skb, vlan_tci);
        skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
 
        if (!skb->dev)