X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fmac80211%2Fwme.c;h=4310e2f65661e8a663c519eded289d263d46f613;hb=ee7af8264dafa0c8c76a8dc596803966c2e29ebc;hp=28437f0001db04946b49c330c172b423e92d0913;hpb=d0f09804144fd9471a13cf4d80e66842c7fa114f;p=linux-2.6

diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 28437f0001..4310e2f656 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -241,12 +241,14 @@ void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
 	} else {
 		struct netdev_queue *txq;
 		spinlock_t *root_lock;
+		struct Qdisc *q;
 
 		txq = netdev_get_tx_queue(local->mdev, agg_queue);
-		root_lock = qdisc_root_lock(txq->qdisc);
+		q = rcu_dereference(txq->qdisc);
+		root_lock = qdisc_lock(q);
 
 		spin_lock_bh(root_lock);
-		qdisc_reset(txq->qdisc);
+		qdisc_reset(q);
 		spin_unlock_bh(root_lock);
 	}
 }