Skip to content

Commit

Permalink
wl1251: enable WMM
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kalle Valo authored and John W. Linville committed Dec 21, 2009
1 parent 46cb35f commit da2fb4e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 2 additions & 0 deletions drivers/net/wireless/wl12xx/wl1251_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions drivers/net/wireless/wl12xx/wl1251_tx.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit da2fb4e

Please sign in to comment.