wl1251: enable WMM
authorKalle Valo <kalle.valo@nokia.com>
Mon, 30 Nov 2009 08:18:47 +0000 (10:18 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 21 Dec 2009 23:56:02 +0000 (18:56 -0500)
Everything is ready now and we can enable WMM in mac80211.

Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/wl12xx/wl1251_main.c
drivers/net/wireless/wl12xx/wl1251_tx.h

index 563c84fc575c8839d04786556dd29d32536c817d..63511ca131b1bfe67c31058e0d60d14b8260b45d 100644 (file)
@@ -1388,6 +1388,8 @@ int wl1251_init_ieee80211(struct wl1251 *wl)
        wl->hw->wiphy->max_scan_ssids = 1;
        wl->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &wl1251_band_2ghz;
 
+       wl->hw->queues = 4;
+
        ret = wl1251_register_hw(wl);
        if (ret)
                goto out;
index b7bead8b0aeb964fbbbda8f411507573f35c94c2..55856c6bb97a85b18f8a65810288f88a61f08ccf 100644 (file)
@@ -212,9 +212,6 @@ struct tx_result {
 
 static inline int wl1251_tx_get_queue(int queue)
 {
-       /* FIXME: use best effort until WMM is enabled */
-       return QOS_AC_BE;
-
        switch (queue) {
        case 0:
                return QOS_AC_VO;