summary refs log tree commit diff
path: root/net/wireless/mlme.c
diff options
context:
space:
mode:
authorPaul Stewart <pstew@chromium.org>2011-06-08 05:52:52 -0700
committerJohn W. Linville <linville@tuxdriver.com>2011-06-10 14:26:51 -0400
commit323222b5ff930a43eab45cec6e58345740fa2a29 (patch)
tree6481219087901b887e6aac468e9cb4d9072542f5 /net/wireless/mlme.c
parentfd854772c11d6ad0377f0b613142e397bec58a3a (diff)
downloadlinux-323222b5ff930a43eab45cec6e58345740fa2a29.tar.gz
cfg80211: Ignore downstream DEAUTH for authtry_bsses
Downsteram DEAUTH messages do not refer to a current authentication
attempt -- AUTH responses do.  Therefore we should not allow DEAUTH
from an AP to void state for an AUTH attempt in progress.

Signed-off-by: Paul Stewart <pstew@chromium.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/mlme.c')
-rw-r--r--net/wireless/mlme.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index 493b939970cd..3633ab6af184 100644
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -170,7 +170,9 @@ void __cfg80211_send_deauth(struct net_device *dev,
 			break;
 		}
 		if (wdev->authtry_bsses[i] &&
-		    memcmp(wdev->authtry_bsses[i]->pub.bssid, bssid, ETH_ALEN) == 0) {
+		    memcmp(wdev->authtry_bsses[i]->pub.bssid, bssid,
+			   ETH_ALEN) == 0 &&
+		    memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) == 0) {
 			cfg80211_unhold_bss(wdev->authtry_bsses[i]);
 			cfg80211_put_bss(&wdev->authtry_bsses[i]->pub);
 			wdev->authtry_bsses[i] = NULL;