From: Eliad Peller Date: Thu, 26 May 2011 08:46:37 +0000 (+0300) Subject: mac80211: clear local->ps_data on disassoc X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a331400bf01231253a0d9ab211c83212d2ac4edb;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: John W. Linville --- 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);