summaryrefslogtreecommitdiffstats
path: root/net/ieee80211/softmac/ieee80211softmac_auth.c
diff options
context:
space:
mode:
authorJeff Garzik2006-05-24 06:29:57 +0200
committerJeff Garzik2006-05-24 06:29:57 +0200
commitdb21e578e551421d76641d72cb3f8296ed3f9e61 (patch)
tree73968aeda7ed0051b5cff6950ad513011a3c7a5f /net/ieee80211/softmac/ieee80211softmac_auth.c
parent[netdrvr pcnet_cs, myri] trim trailing whitespace (diff)
parent[PATCH] hostap: new pcmcia IDs (diff)
downloadkernel-qcow2-linux-db21e578e551421d76641d72cb3f8296ed3f9e61.tar.gz
kernel-qcow2-linux-db21e578e551421d76641d72cb3f8296ed3f9e61.tar.xz
kernel-qcow2-linux-db21e578e551421d76641d72cb3f8296ed3f9e61.zip
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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c
index 06e332624665..084b6211f293 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;