mac80211: remove IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT
Johannes Berg
maintainerPATCH 1/1 mac80211: remove IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT
Just setting IEEE80211_CONF_CHANGE_PS should be sufficient for changes in the power saving things. The driver already tells us whether it wants notification of dynps via the "have dynps support" hw flag.
Signed-off-by Johannes Berg <[email protected]>
--- include/net/mac80211.h | 10 ++++------ net/mac80211/wext.c | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-)
include/net/mac80211.h +4 -6
@@ -532,8 +532,7 @@ enum ieee80211_conf_flags {* @IEEE80211_CONF_CHANGE_BEACON_INTERVAL: the beacon interval changed * @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed * @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed -* @IEEE80211_CONF_CHANGE_PS: the PS flag changed -* @IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT: the dynamic PS timeout changed +* @IEEE80211_CONF_CHANGE_PS: the PS flag or dynamic PS timeout changed * @IEEE80211_CONF_CHANGE_POWER: the TX power changed * @IEEE80211_CONF_CHANGE_CHANNEL: the channel/channel_type changed * @IEEE80211_CONF_CHANGE_RETRY_LIMITS: retry limits changed
@@ -544,10 +543,9 @@ enum ieee80211_conf_changed {IEEE80211_CONF_CHANGE_LISTEN_INTERVAL =BIT (2 ),IEEE80211_CONF_CHANGE_RADIOTAP =BIT (3 ),IEEE80211_CONF_CHANGE_PS =BIT (4 ), -IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT =BIT (5 ), -IEEE80211_CONF_CHANGE_POWER =BIT (6 ), -IEEE80211_CONF_CHANGE_CHANNEL =BIT (7 ), - IEEE80211_CONF_CHANGE_RETRY_LIMITS = BIT(8), +IEEE80211_CONF_CHANGE_POWER =BIT (5 ), +IEEE80211_CONF_CHANGE_CHANNEL =BIT (6 ), + IEEE80211_CONF_CHANGE_RETRY_LIMITS = BIT(7), };/**
net/mac80211/wext.c +1 -2
@@ -622,8 +622,7 @@ static int ieee80211_ioctl_siwpower(stru conf->dynamic_ps_timeout = timeout;if (local->hw.flags &IEEE80211_HW_SUPPORTS_DYNAMIC_PS ) -ieee80211_hw_config (local, -IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT ); +ieee80211_hw_config (local,IEEE80211_CONF_CHANGE_PS );ieee80211_recalc_ps (local,-1 );
Quoted 4 lines · Johannes Berg
Just setting
IEEE80211_CONF_CHANGE_PSshould be sufficient for changes in the power saving things. The driver already tells us whether it wants notification of dynps via the "have dynps support" hw flag.
I agree.
Quoted 1 line
Signed-off-by Johannes Berg <[email protected]>
Reviewed-by Kalle Valo <[email protected]>
Signature · 1 line
Kalle Valo