[PATCH] softmac: don't reassociate if user asked for deauthentication
authorDaniel Drake <dsd@gentoo.org>
Sun, 30 Apr 2006 18:49:30 +0000 (19:49 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 5 May 2006 20:55:22 +0000 (16:55 -0400)
When wpa_supplicant exits, it uses SIOCSIWMLME to request
deauthentication.  softmac then tries to reassociate without any user
intervention, which isn't the desired behaviour of this signal.

This change makes softmac only attempt reassociation if the remote
network itself deauthenticated us.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/ieee80211/softmac/ieee80211softmac_auth.c

index 9a0eac6c61eb2f307a9a36198848bfec46f2d3c9..d6a04f3ab86cc166132e97edad879b35dd7fc8fd 100644 (file)
@@ -298,8 +298,6 @@ ieee80211softmac_deauth_from_net(struct ieee80211softmac_device *mac,
        
        /* can't transmit data right now... */
        netif_carrier_off(mac->dev);
-       /* let's try to re-associate */
-       schedule_work(&mac->associnfo.work);
        spin_unlock_irqrestore(&mac->lock, flags);
 }
 
@@ -360,5 +358,8 @@ ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_deauth *de
        }
 
        ieee80211softmac_deauth_from_net(mac, net);
+
+       /* let's try to re-associate */
+       schedule_work(&mac->associnfo.work);
        return 0;
 }