* [PATCH net-next-2.6] vlan: Use __vlan_hwaccel_put_tag() in rx
@ 2009-11-13 16:33 Eric Dumazet
2009-11-16 6:23 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Eric Dumazet @ 2009-11-13 16:33 UTC (permalink / raw)
To: David S. Miller; +Cc: Linux Netdev List
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>
---
net/8021q/vlan_core.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 8d5ca2a..971d375 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next-2.6] vlan: Use __vlan_hwaccel_put_tag() in rx
2009-11-13 16:33 [PATCH net-next-2.6] vlan: Use __vlan_hwaccel_put_tag() in rx Eric Dumazet
@ 2009-11-16 6:23 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-11-16 6:23 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 13 Nov 2009 17:33:11 +0100
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-11-16 6:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-13 16:33 [PATCH net-next-2.6] vlan: Use __vlan_hwaccel_put_tag() in rx Eric Dumazet
2009-11-16 6:23 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).