diff options
| author | Kalle Valo <kalle.valo@nokia.com> | 2009-11-30 10:18:47 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-21 18:56:02 -0500 |
| commit | da2fb4e9c215b8f0f8954818691549f8a34135be (patch) | |
| tree | 30e6e2dd953d9aa52459308e3cb205354b87499f | |
| parent | 46cb35f5e761306b031029af2061ea263359a764 (diff) | |
| download | linux-da2fb4e9c215b8f0f8954818691549f8a34135be.tar.gz linux-da2fb4e9c215b8f0f8954818691549f8a34135be.tar.xz | |
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>
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_tx.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c index 563c84fc575c..63511ca131b1 100644 --- a/drivers/net/wireless/wl12xx/wl1251_main.c +++ b/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; diff --git a/drivers/net/wireless/wl12xx/wl1251_tx.h b/drivers/net/wireless/wl12xx/wl1251_tx.h index b7bead8b0aeb..55856c6bb97a 100644 --- a/drivers/net/wireless/wl12xx/wl1251_tx.h +++ b/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; |