diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-06-28 13:45:58 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-28 13:45:58 +0200 |
| commit | b1fbd46976d047a6d6767872a9112afaa914fd82 (patch) | |
| tree | 59b471d8b38ca2a271fcde02f8f049e390ef485b /net/mac80211/mlme.c | |
| parent | bf0c111ec80355ee9fe2e2bdb609a536b54768d8 (diff) | |
| parent | bf52592fe4901f486a5266fd73e4ee80205b18b4 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 398acc4f649d..398ce8e9c4d7 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1331,6 +1331,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, if (WARN_ON(!ifmgd->associated)) return; + ieee80211_stop_poll(sdata); + memcpy(bssid, ifmgd->associated->bssid, ETH_ALEN); ifmgd->associated = NULL; @@ -2589,8 +2591,6 @@ static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata, struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; u8 frame_buf[DEAUTH_DISASSOC_LEN]; - ieee80211_stop_poll(sdata); - ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, reason, false, frame_buf); mutex_unlock(&ifmgd->mtx); @@ -3081,7 +3081,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata, } local->oper_channel = cbss->channel; - ieee80211_hw_config(local, 0); + ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL); if (sta) { u32 rates = 0, basic_rates = 0; |