Re: VLAN packets silently dropped in promiscuous mode
From: Eric Dumazet <hidden>
Date: 2010-09-30 09:55:37
Subsystem:
networking [general], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Le jeudi 30 septembre 2010 à 11:16 +0200, Eric Dumazet a écrit :
Agreed Could you try following patch, based on net-next-2.6 ?
Here is the official patch I cooked for net-2.6 (linux-2.6) I tested it successfully with a tg3 NIC. Thanks [PATCH] vlan: dont drop packets from unknown vlans in promiscuous mode Roger Luethi noticed packets for unknown VLANs getting silently dropped even in promiscuous mode. Check for promiscuous mode in __vlan_hwaccel_rx() and vlan_gro_common() before drops. Reported-by: Roger Luethi <redacted> Signed-off-by: Eric Dumazet <redacted> --- net/8021q/vlan_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 01ddb04..ba502b4 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c@@ -24,7 +24,7 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, if (vlan_dev) skb->dev = vlan_dev; - else if (vlan_id) + else if (vlan_id && !(skb->dev->flags & IFF_PROMISC)) goto drop; return (polling ? netif_receive_skb(skb) : netif_rx(skb));
@@ -102,7 +102,7 @@ vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp, if (vlan_dev) skb->dev = vlan_dev; - else if (vlan_id) + else if (vlan_id && !(skb->dev->flags & IFF_PROMISC)) goto drop; for (p = napi->gro_list; p; p = p->next) {