From: Jarek Poplawski <jarkao2@gmail.com>
Date: Wed, 27 Aug 2008 09:12:52 +0000 (-0700)
Subject: pkt_sched: Fix dev_graft_qdisc() locking
X-Git-Tag: v2.6.27-rc5~8^2~10
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=666d9bbedfff7c2c37eab92e715641922dee6864;p=linux-2.6-omap-h63xx.git

pkt_sched: Fix dev_graft_qdisc() locking

During dev_graft_qdisc() dev is deactivated, so qdisc_root_lock()
returns wrong lock of noop_qdisc instead of qdisc_sleeping.

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index e7fb9e0d21b..341d558b6e3 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -624,7 +624,7 @@ static struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue,
 	struct Qdisc *oqdisc = dev_queue->qdisc_sleeping;
 	spinlock_t *root_lock;
 
-	root_lock = qdisc_root_lock(oqdisc);
+	root_lock = qdisc_lock(oqdisc);
 	spin_lock_bh(root_lock);
 
 	/* Prune old scheduler */