From: Samuel Ortiz Date: Thu, 10 Jun 2010 14:54:18 +0000 (+0200) Subject: Staging: rtl8192e: Do not send NULL BSSID events when not associated X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ae67b584b40883cf63492b9df2b06c035da84780;p=linux-beck.git Staging: rtl8192e: Do not send NULL BSSID events when not associated If we're not associated, we should not send wireless events to let userspace know that we just left an ESSID, simply because we havent yet joined it. If we keep on doing that, wpa_supplicant could receive such events while actually trying to join an ESSID, and thus decide to stop trying. This leads to a lot of connection failures as this driver seems to be sending GIWAP events quite a lot. Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c index 46b6e8c900e9..d2a243a71824 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c +++ b/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))