Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b93ab837 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

vlan: Use __vlan_hwaccel_put_tag() in rx 



Commit 05423b24 (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: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5d5d172

net/8021q/vlan_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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)