Bladeren bron

wl1251: enable WMM

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>
Kalle Valo 15 jaren geleden
bovenliggende
commit
da2fb4e9c2
2 gewijzigde bestanden met toevoegingen van 2 en 3 verwijderingen
  1. 2 0
      drivers/net/wireless/wl12xx/wl1251_main.c
  2. 0 3
      drivers/net/wireless/wl12xx/wl1251_tx.h

+ 2 - 0
drivers/net/wireless/wl12xx/wl1251_main.c

@@ -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;

+ 0 - 3
drivers/net/wireless/wl12xx/wl1251_tx.h

@@ -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;