| Message ID | 1382819655-30430-10-git-send-email-pali.rohar@gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat 2013-10-26 22:34:08, Pali Rohár wrote: > From: David Gnedt <david.gnedt@davizone.at> > > Force power saving off while monitor interface is present. > > Signed-off-by: David Gnedt <david.gnedt@davizone.at> > --- > drivers/net/wireless/ti/wl1251/main.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c > index 727f2ee..62cb374 100644 > --- a/drivers/net/wireless/ti/wl1251/main.c > +++ b/drivers/net/wireless/ti/wl1251/main.c > @@ -617,7 +617,8 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) > goto out_sleep; > } > > - if (conf->flags & IEEE80211_CONF_PS && !wl->psm_requested) { > + if (conf->flags & IEEE80211_CONF_PS && !wl->psm_requested && > + !wl->monitor_present) { > wl1251_debug(DEBUG_PSM, "psm enabled"); > > wl->psm_requested = true; > @@ -633,8 +634,8 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) > ret = wl1251_ps_set_mode(wl, STATION_POWER_SAVE_MODE); > if (ret < 0) > goto out_sleep; > - } else if (!(conf->flags & IEEE80211_CONF_PS) && > - wl->psm_requested) { > + } else if ((!(conf->flags & IEEE80211_CONF_PS) || wl->monitor_present) > + && wl->psm_requested) { > wl1251_debug(DEBUG_PSM, "psm disabled"); > These boolean expressions make my head spin. Introduce helper function can_do_pm()... return (conf->flags & IEEE80211_CONF_PS) && !wl->monitor_present ? Thanks, Pavel
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c index 727f2ee..62cb374 100644 --- a/drivers/net/wireless/ti/wl1251/main.c +++ b/drivers/net/wireless/ti/wl1251/main.c @@ -617,7 +617,8 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) goto out_sleep; } - if (conf->flags & IEEE80211_CONF_PS && !wl->psm_requested) { + if (conf->flags & IEEE80211_CONF_PS && !wl->psm_requested && + !wl->monitor_present) { wl1251_debug(DEBUG_PSM, "psm enabled"); wl->psm_requested = true; @@ -633,8 +634,8 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) ret = wl1251_ps_set_mode(wl, STATION_POWER_SAVE_MODE); if (ret < 0) goto out_sleep; - } else if (!(conf->flags & IEEE80211_CONF_PS) && - wl->psm_requested) { + } else if ((!(conf->flags & IEEE80211_CONF_PS) || wl->monitor_present) + && wl->psm_requested) { wl1251_debug(DEBUG_PSM, "psm disabled"); wl->psm_requested = false;