From 9a7cb76306f398d243597c542b1c1ca0fdb97c38 Mon Sep 17 00:00:00 2001 From: David Spinadel Date: Tue, 12 Jun 2012 09:59:45 +0300 Subject: [PATCH] --- yaml --- r: 311379 b: refs/heads/master c: 79543d8eecc0957ac6fe3ec1e2486ad31d4b67a3 h: refs/heads/master i: 311377: 75d84480c8efec88b350a82e372f7c0f852c57b4 311375: a2caaf288deb51d874dc52738d14b992783a98c1 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1a2de1ccaffd..73e19a5cfc34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 554a43d5e77e8256aa9685ffd19ad555e6f77979 +refs/heads/master: 79543d8eecc0957ac6fe3ec1e2486ad31d4b67a3 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 91d84cc77bbf..66e4fcdd1c6b 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/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);