summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-05-26 11:46:37 +0300
committerJohn W. Linville <linville@tuxdriver.com>2011-05-27 12:53:46 -0400
commita331400bf01231253a0d9ab211c83212d2ac4edb (patch)
tree25995aff5387cac409666b2ca3979ac65fd3f59e /net
parent64bd0821a3b66c3307d7a4ee5523e3e35ec2df0e (diff)
downloadlinux-a331400bf01231253a0d9ab211c83212d2ac4edb.tar.bz2
mac80211: clear local->ps_data on disassoc
local->ps_data wasn't cleared on disassociation, which (in some corner cases) caused reconnections to enter psm before association completed. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mlme.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 746595597b68..456cccf26b51 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1095,6 +1095,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
local->hw.conf.flags &= ~IEEE80211_CONF_PS;
config_changed |= IEEE80211_CONF_CHANGE_PS;
}
+ local->ps_sdata = NULL;
ieee80211_hw_config(local, config_changed);