wl1271: enable WMM

Everything is ready now and we can enable WMM in wl1271.

Signed-off-by: Kalle Valo <[email protected]>
Reviewed-by: Juuso Oikarinen <[email protected]>
Signed-off-by: Juuso Oikarinen <[email protected]>
Signed-off-by: Luciano Coelho <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index abf9f22ee96862fa1f7277842fde8d2ce852461b..d21bfe29531dd55eb005accc06dff6e440152598 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -2091,6 +2091,8 @@ int wl1271_init_ieee80211(struct wl1271 *wl)
        if (wl1271_11a_enabled())
                wl->hw->wiphy->bands[IEEE80211_BAND_5GHZ] = &wl1271_band_5ghz;
 
+       wl->hw->queues = 4;
+
        SET_IEEE80211_DEV(wl->hw, wl1271_wl_to_dev(wl));
 
        return 0;

diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.h b/drivers/net/wireless/wl12xx/wl1271_tx.h
index 8b9f6b4f5652c6d861345d7056e50185e5d64f44..5e6c27a57415ba33e83d4a0030b45f1aedf3d8e5 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_tx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_tx.h
@@ -125,9 +125,6 @@ struct wl1271_tx_hw_res_if {
 
 static inline int wl1271_tx_get_queue(int queue)
 {
-       /* FIXME: use best effort until WMM is enabled */
-       return CONF_TX_AC_BE;
-
        switch (queue) {
        case 0:
                return CONF_TX_AC_VO;