summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-07-12 14:46:43 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-07-12 16:05:31 -0400
commit643f82e32f14faf0d0944c804203a6681b6b0a1e (patch)
tree9bea8e53249b1ef9be25afdf36d4e411573000d7
parente71bcbd0a149b6baa3419b5822f1ceb2b54e6ff6 (diff)
downloadlinux-3.10-643f82e32f14faf0d0944c804203a6681b6b0a1e.tar.gz
linux-3.10-643f82e32f14faf0d0944c804203a6681b6b0a1e.tar.bz2
linux-3.10-643f82e32f14faf0d0944c804203a6681b6b0a1e.zip
cfg80211: ignore spurious deauth
Ever since mac80211/drivers are no longer fully in charge of keeping track of the auth status, trying to make them do so will fail. Instead of warning and reporting the deauthentication to userspace, cfg80211 must simply ignore it so that spurious deauthentications, e.g. before starting authentication, aren't seen by userspace as actual deauthentications. Cc: stable@kernel.org Reported-by: Paul Stewart <pstew@google.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/wireless/mlme.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index 9f95354f859..e74a1a2119d 100644
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -44,10 +44,10 @@ void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len)
}
}
- WARN_ON(!done);
-
- nl80211_send_rx_auth(rdev, dev, buf, len, GFP_KERNEL);
- cfg80211_sme_rx_auth(dev, buf, len);
+ if (done) {
+ nl80211_send_rx_auth(rdev, dev, buf, len, GFP_KERNEL);
+ cfg80211_sme_rx_auth(dev, buf, len);
+ }
wdev_unlock(wdev);
}