From: Samuel Ortiz Date: Fri, 9 Apr 2010 22:33:19 +0000 (+0200) Subject: Staging: rtl8187se: Do not send NULL BSSID events when not associated X-Git-Tag: MMI-PSA29.97-13-9~23841^2^2~344 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=592010bb71901d991cd758f6294db2db47e8efa1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Staging: rtl8187se: 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/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c index 5fdb8f3df0a7..e099a5fa0494 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c @@ -2322,9 +2322,11 @@ void ieee80211_disassociate(struct ieee80211_device *ieee) if(IS_DOT11D_ENABLE(ieee)) Dot11d_Reset(ieee); - ieee->state = IEEE80211_NOLINK; + ieee->link_change(ieee->dev); - notify_wx_assoc_event(ieee); + if (ieee->state == IEEE80211_LINKED) + notify_wx_assoc_event(ieee); + ieee->state = IEEE80211_NOLINK; } void ieee80211_associate_retry_wq(struct work_struct *work)