mac80211: clear local->ps_data on disassoc
authorEliad Peller <eliad@wizery.com>
Thu, 26 May 2011 08:46:37 +0000 (11:46 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 27 May 2011 16:53:46 +0000 (12:53 -0400)
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>
net/mac80211/mlme.c

index 746595597b68417671393e9ac5c21c18f5669026..456cccf26b512ef1babb0420471dd95b51f16670 100644 (file)
@@ -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);