OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wl1251: add U-APSD support 

wl1251 firmware supports U-APSD just with a simple queue configuration
change so enable it.

Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Kalle Valo 2010-01-12 10:43:15 +02:00 committed by John W. Linville
parent 8f8ff91652
commit 4ff6ffa107
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/wireless/wl12xx/wl1251_main.c
View File

@ -1143,6 +1143,7 @@ static struct ieee80211_channel wl1251_channels[] = {
static int wl1251_op_conf_tx(struct ieee80211_hw *hw, u16 queue, static int wl1251_op_conf_tx(struct ieee80211_hw *hw, u16 queue,
const struct ieee80211_tx_queue_params *params) const struct ieee80211_tx_queue_params *params)
{ {
enum wl1251_acx_ps_scheme ps_scheme;
struct wl1251 *wl = hw->priv; struct wl1251 *wl = hw->priv;
int ret; int ret;
@ -1160,10 +1161,14 @@ static int wl1251_op_conf_tx(struct ieee80211_hw *hw, u16 queue,
if (ret < 0) if (ret < 0)
goto out_sleep; goto out_sleep;
if (params->uapsd)
ps_scheme = WL1251_ACX_PS_SCHEME_UPSD_TRIGGER;
else
ps_scheme = WL1251_ACX_PS_SCHEME_LEGACY;
ret = wl1251_acx_tid_cfg(wl, wl1251_tx_get_queue(queue), ret = wl1251_acx_tid_cfg(wl, wl1251_tx_get_queue(queue),
CHANNEL_TYPE_EDCF, CHANNEL_TYPE_EDCF,
wl1251_tx_get_queue(queue), wl1251_tx_get_queue(queue), ps_scheme,
WL1251_ACX_PS_SCHEME_LEGACY,
WL1251_ACX_ACK_POLICY_LEGACY); WL1251_ACX_ACK_POLICY_LEGACY);
if (ret < 0) if (ret < 0)
goto out_sleep; goto out_sleep;
@ -1237,7 +1242,8 @@ int wl1251_init_ieee80211(struct wl1251 *wl)
wl->hw->flags = IEEE80211_HW_SIGNAL_DBM | wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |
IEEE80211_HW_NOISE_DBM | IEEE80211_HW_NOISE_DBM |
IEEE80211_HW_SUPPORTS_PS | IEEE80211_HW_SUPPORTS_PS |
IEEE80211_HW_BEACON_FILTER; IEEE80211_HW_BEACON_FILTER |
IEEE80211_HW_SUPPORTS_UAPSD;
wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
wl->hw->wiphy->max_scan_ssids = 1; wl->hw->wiphy->max_scan_ssids = 1;