aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-07-12 14:46:43 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-10 11:09:20 -0700
commit89b15fbbcb5e77845ea1d8e96e0973caa0749fed (patch)
treec46bfc25a6c89984237a427096fe8cd094fa4963 /net
parent433a64e4233a9dd3775b1e248a01d88a3a038592 (diff)
downloadlinux-2.6.34-ux500-89b15fbbcb5e77845ea1d8e96e0973caa0749fed.tar.gz
cfg80211: ignore spurious deauth
commit 643f82e32f14faf0d0944c804203a6681b6b0a1e upstream. 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. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
-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 48ead6f0426..ef17fcf8509 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);
}