diff options
| author | David S. Miller | 2009-12-30 04:44:25 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-12-30 04:44:25 +0100 |
| commit | 7f9d3577e2603ca279c3176b696eba392f21cbe2 (patch) | |
| tree | e2135eddba600910cdebb54c8b01de53473ecefb /net/wireless/mlme.c | |
| parent | NET: XFRM: Fix spelling of neighbour. (diff) | |
| parent | Revert "b43: Enforce DMA descriptor memory constraints" (diff) | |
| download | kernel-qcow2-linux-7f9d3577e2603ca279c3176b696eba392f21cbe2.tar.gz kernel-qcow2-linux-7f9d3577e2603ca279c3176b696eba392f21cbe2.tar.xz kernel-qcow2-linux-7f9d3577e2603ca279c3176b696eba392f21cbe2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/wireless/mlme.c')
| -rw-r--r-- | net/wireless/mlme.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index 1001db4912f7..82e6002c8d67 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c @@ -93,7 +93,18 @@ void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len) } } - WARN_ON(!bss); + /* + * We might be coming here because the driver reported + * a successful association at the same time as the + * user requested a deauth. In that case, we will have + * removed the BSS from the auth_bsses list due to the + * deauth request when the assoc response makes it. If + * the two code paths acquire the lock the other way + * around, that's just the standard situation of a + * deauth being requested while connected. + */ + if (!bss) + goto out; } else if (wdev->conn) { cfg80211_sme_failed_assoc(wdev); /* |