From 41229b7040a7ed4404c29ee29896fde210e30f8a Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Sat, 10 Apr 2010 00:33:19 +0200 Subject: [PATCH] --- yaml --- r: 197121 b: refs/heads/master c: 592010bb71901d991cd758f6294db2db47e8efa1 h: refs/heads/master i: 197119: 583b8176d5e6ddcfc5c0d266d32e4079fba878b3 v: v3 --- [refs] | 2 +- .../drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 885a2fabb962..777434520fdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3eec314fb26fc0e75c6f5d20f9b3d528ebf342d7 +refs/heads/master: 592010bb71901d991cd758f6294db2db47e8efa1 diff --git a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c index 5fdb8f3df0a7..e099a5fa0494 100644 --- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +++ b/trunk/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)