From: Patrick McHardy <kaber@trash.net>
Date: Wed, 28 Mar 2007 19:58:20 +0000 (+0200)
Subject: [NET_SCHED]: Fix ingress locking
X-Git-Tag: v2.6.16.46-rc1~13
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b50f212883c001575f2aee338f7142bba0d5e60f;p=karo-tx-linux.git

[NET_SCHED]: Fix ingress locking

Ingress queueing uses a seperate lock for serializing enqueue operations,
but fails to properly protect itself against concurrent changes to the
qdisc tree. Use queue_lock for now since the real fix it quite intrusive.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---

diff --git a/net/core/dev.c b/net/core/dev.c
index caa8cbb0e0ff..23cdd8b05751 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1566,10 +1566,10 @@ static int ing_filter(struct sk_buff *skb)
 
 		skb->tc_verd = SET_TC_AT(skb->tc_verd,AT_INGRESS);
 
-		spin_lock(&dev->ingress_lock);
+		spin_lock(&dev->queue_lock);
 		if ((q = dev->qdisc_ingress) != NULL)
 			result = q->enqueue(skb, q);
-		spin_unlock(&dev->ingress_lock);
+		spin_unlock(&dev->queue_lock);
 
 	}