diff options
| author | Kalle Valo <kalle.valo@nokia.com> | 2010-03-18 12:26:33 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-03-23 16:50:21 -0400 |
| commit | 12bd89499f22ec01bbff21fd04a347ee82726bf6 (patch) | |
| tree | 571fcfdc665c1e6ec9feb5bc55abc769614bda17 | |
| parent | 7fc3a8647d2eaa8bc2f7ac7e9baff55199da7be6 (diff) | |
| download | blackbird-op-linux-12bd89499f22ec01bbff21fd04a347ee82726bf6.tar.gz blackbird-op-linux-12bd89499f22ec01bbff21fd04a347ee82726bf6.zip | |
wl1271: enable WMM
Everything is ready now and we can enable WMM in wl1271.
Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_tx.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index abf9f22ee968..d21bfe29531d 100644 --- 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 8b9f6b4f5652..5e6c27a57415 100644 --- 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; |
