FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-03 07:41:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wl1251: disable power saving in monitor mode

Browse Source 
Force power saving off while monitor interface is present.

Signed-off-by: David Gnedt <david.gnedt@davizone.at>
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
David Gnedt 2014-01-07 13:09:06 +01:00 committed by John W. Linville
parent 9ed74ba029
commit dd4a560f0a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/ti/wl1251/main.c
View File

@ -569,6 +569,11 @@ static int wl1251_build_qos_null_data(struct wl1251 *wl)
sizeof(template)); sizeof(template));
} }
static bool wl1251_can_do_pm(struct ieee80211_conf *conf, struct wl1251 *wl)
{
return (conf->flags & IEEE80211_CONF_PS) && !wl->monitor_present;
}
static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
{ {
struct wl1251 *wl = hw->priv; struct wl1251 *wl = hw->priv;
@ -616,7 +621,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
goto out_sleep; goto out_sleep;
} }
if (conf->flags & IEEE80211_CONF_PS && !wl->psm_requested) { if (wl1251_can_do_pm(conf, wl) && !wl->psm_requested) {
wl1251_debug(DEBUG_PSM, "psm enabled"); wl1251_debug(DEBUG_PSM, "psm enabled");
wl->psm_requested = true; wl->psm_requested = true;
@ -632,8 +637,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
ret = wl1251_ps_set_mode(wl, STATION_POWER_SAVE_MODE); ret = wl1251_ps_set_mode(wl, STATION_POWER_SAVE_MODE);
if (ret < 0) if (ret < 0)
goto out_sleep; goto out_sleep;
} else if (!(conf->flags & IEEE80211_CONF_PS) && } else if (!wl1251_can_do_pm(conf, wl) && wl->psm_requested) {
wl->psm_requested) {
wl1251_debug(DEBUG_PSM, "psm disabled"); wl1251_debug(DEBUG_PSM, "psm disabled");
wl->psm_requested = false; wl->psm_requested = false;