From a482a69dd3ac794bb672202ff5ed7f2c9e52caed Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Thu, 10 Jun 2010 16:54:18 +0200 Subject: [PATCH] --- yaml --- r: 205709 b: refs/heads/master c: ae67b584b40883cf63492b9df2b06c035da84780 h: refs/heads/master i: 205707: d4c9ce989e6ebbda2cc31e9d9eee4a5338ad92ca v: v3 --- [refs] | 2 +- .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 54304e9b9c09..c2cf05bb0dd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96bd55bd67de2dddb1d917b7631e23b86a8b1cd4 +refs/heads/master: ae67b584b40883cf63492b9df2b06c035da84780 diff --git a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c index 46b6e8c900e9..d2a243a71824 100644 --- a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c +++ b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c @@ -2873,11 +2873,16 @@ void ieee80211_disassociate(struct ieee80211_device *ieee) if(IS_DOT11D_ENABLE(ieee)) Dot11d_Reset(ieee); #endif - ieee->state = IEEE80211_NOLINK; ieee->is_set_key = false; ieee->link_change(ieee->dev); //HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); - notify_wx_assoc_event(ieee); + if (ieee->state == IEEE80211_LINKED || + ieee->state == IEEE80211_ASSOCIATING) { + ieee->state = IEEE80211_NOLINK; + notify_wx_assoc_event(ieee); + } + + ieee->state = IEEE80211_NOLINK; } #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))