diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-13 18:05:40 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-13 18:05:40 (GMT) |
| commit | 1f7e0102820f11a0dcd3a2f90140abf14c894ba8 (patch) | |
| tree | 2ae08acbb26ddb2fa662db63c1dd111c0b5b646f /net/mac80211/mlme.c | |
| parent | 6ddcd46463aa66855f1f8e74de454740a5f4aef4 (diff) | |
| parent | 79543d8eecc0957ac6fe3ec1e2486ad31d4b67a3 (diff) | |
| download | linux-fsl-qoriq-1f7e0102820f11a0dcd3a2f90140abf14c894ba8.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 91d84cc..66e4fcd 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1352,6 +1352,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; @@ -2612,8 +2614,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); |