mac80211: Drop out of associated state if link is lost
authorMichael Wu <flamingice@sourmilk.net>
Sat, 10 Nov 2007 05:15:25 +0000 (00:15 -0500)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 20 Dec 2007 00:43:45 +0000 (16:43 -0800)
There is no point in staying in IEEE80211_ASSOCIATED if there is no
sta_info entry to receive frames with.

Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/ieee80211_sta.c

index 16afd24d4f6b2bb392914e9fac06434ed205b54f..bee8080f2249ff5c0ab56a33293bd02dca7ea5ec 100644 (file)
@@ -808,12 +808,8 @@ static void ieee80211_associated(struct net_device *dev,
                sta_info_put(sta);
        }
        if (disassoc) {
-               union iwreq_data wrqu;
-               memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
-               wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-               wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
-               mod_timer(&ifsta->timer, jiffies +
-                                     IEEE80211_MONITORING_INTERVAL + 30 * HZ);
+               ifsta->state = IEEE80211_DISABLED;
+               ieee80211_set_associated(dev, ifsta, 0);
        } else {
                mod_timer(&ifsta->timer, jiffies +
                                      IEEE80211_MONITORING_INTERVAL);