aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2012-06-25 03:48:25 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-06-28 05:40:02 -0400
commitc9b22fb87a00ceb8afa78089d5cf676cf8b3319d (patch)
tree307e040525ea144dc70322138d43207cc55409ec /net/mac80211
parentf823981e288f83113bf1129ff2c94e2fd74a28dd (diff)
mac80211: don't require associated->beacon_ies for ps
beacon_ies is needed only in order to extract the dtim period. However, even if it's missing we can still enter ps with dtim=1 (which also happens if the TIM ie is invalid). Most drivers don't use conf.max_sleep_period/ps_dtim_period anyway, and this check prevents them from entering ps if they don't have beacon (but only probe response), even though the beacon is not needed at all. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mlme.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index c54388b3ebff..398acc4f649d 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -902,9 +902,6 @@ static bool ieee80211_powersave_allowed(struct ieee80211_sub_if_data *sdata)
902 if (!mgd->associated) 902 if (!mgd->associated)
903 return false; 903 return false;
904 904
905 if (!mgd->associated->beacon_ies)
906 return false;
907
908 if (mgd->flags & (IEEE80211_STA_BEACON_POLL | 905 if (mgd->flags & (IEEE80211_STA_BEACON_POLL |
909 IEEE80211_STA_CONNECTION_POLL)) 906 IEEE80211_STA_CONNECTION_POLL))
910 return false; 907 return false;