Merge git://git.infradead.org/mtd-2.6

[pandora-kernel.git] / net / mac80211 / wme.c

diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 6e8099e..28437f0 100644 (file)
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -188,6 +188,9 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
 {
        int i;
 
+       /* XXX: currently broken due to cb/requeue use */
+       return -EPERM;
+
        /* prepare the filter and save it for the SW queue
         * matching the received HW queue */
 
@@ -289,7 +292,7 @@ void ieee80211_requeue(struct ieee80211_local *local, int queue)
                root_lock = qdisc_root_lock(qdisc);
 
                spin_lock(root_lock);
-               qdisc->enqueue(skb, qdisc);
+               qdisc_enqueue_root(skb, qdisc);
                spin_unlock(root_lock);
        }