diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-05-24 00:29:57 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-24 00:29:57 -0400 |
commit | db21e578e551421d76641d72cb3f8296ed3f9e61 (patch) | |
tree | 73968aeda7ed0051b5cff6950ad513011a3c7a5f /net/ieee80211/softmac/ieee80211softmac_auth.c | |
parent | 6ed14254cb6e269030ff09bed8673473b7be0283 (diff) | |
parent | df8ccb9bf1ca360581a94c2245efb9fa613fbb29 (diff) |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_auth.c')
-rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_auth.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c index 06e33262466..084b6211f29 100644 --- a/net/ieee80211/softmac/ieee80211softmac_auth.c +++ b/net/ieee80211/softmac/ieee80211softmac_auth.c @@ -279,6 +279,9 @@ ieee80211softmac_deauth_from_net(struct ieee80211softmac_device *mac, struct list_head *list_ptr; unsigned long flags; + /* deauthentication implies disassociation */ + ieee80211softmac_disassoc(mac); + /* Lock and reset status flags */ spin_lock_irqsave(&mac->lock, flags); net->authenticating = 0; |