pkt_sched: Kill netdev_queue lock.

We can simply use the qdisc->q.lock for all of the
qdisc tree synchronization.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 2 deletions

diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index ade3372221c7..8b0ff345f9da 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -156,12 +156,15 @@ teql_destroy(struct Qdisc* sch)
                                         master->slaves = NEXT_SLAVE(q);
                                         if (q == master->slaves) {
                                                 struct netdev_queue *txq;
+                                                spinlock_t *root_lock;
 
                                                 txq = netdev_get_tx_queue(master->dev, 0);
                                                 master->slaves = NULL;
-                                                spin_lock_bh(&txq->lock);
+
+                                                root_lock = qdisc_root_lock(txq->qdisc);
+                                                spin_lock_bh(root_lock);
                                                 qdisc_reset(txq->qdisc);
-                                                spin_unlock_bh(&txq->lock);
+                                                spin_unlock_bh(root_lock);
                                         }
                                 }
                                 skb_queue_purge(&dat->q);