Re: 2.6.35 -> 2.6.36 panic when vlan and promisc with tg3

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Eric Dumazet
Date: Tuesday, November 30, 2010 - 2:20 am

Le mardi 30 novembre 2010 à 09:59 +0100, Michael Leun a écrit :

Could you try with following patch instead, for net/core/dev.c 

(and keep the net/8021q/vlan_core.c part)

--- net/core/dev.c.orig
+++ net/core/dev.c
@@ -2891,6 +2891,9 @@
 ncls:
 #endif
 
+	if (unlikely(vlan_tx_tag_present(skb)))
+		goto bypass;
+
 	/* Handle special case of bridge or macvlan */
 	rx_handler = rcu_dereference(skb->dev->rx_handler);
 	if (rx_handler) {
@@ -2927,6 +2930,7 @@
 		}
 	}
 
+bypass:
 	if (pt_prev) {
 		ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
 	} else {


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
2.6.35 -> 2.6.36 panic when vlan and promisc with tg3, Michael Leun, (Mon Nov 29, 12:17 pm)
Re: 2.6.35 -> 2.6.36 panic when vlan and promisc with tg3, Eric Dumazet, (Tue Nov 30, 2:20 am)