diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-30 05:28:59 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-30 05:28:59 +0100 |
| commit | 0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01 (patch) | |
| tree | 2e336be8a4bd2e59bcd4b69b00feb77c6672a9cb /net/wireless/mlme.c | |
| parent | net,socket: introduce DECLARE_SOCKADDR helper to catch overflow at build time (diff) | |
| parent | net: Fix 'Re: PACKET_TX_RING: packet size is too long' (diff) | |
| download | linux-0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01.tar.xz linux-0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/wireless/mlme.c')
| -rw-r--r-- | net/wireless/mlme.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index 1f87b4e7f4f7..83c2a288dc63 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c @@ -62,6 +62,7 @@ void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len) u8 *ie = mgmt->u.assoc_resp.variable; int i, ieoffs = offsetof(struct ieee80211_mgmt, u.assoc_resp.variable); struct cfg80211_internal_bss *bss = NULL; + bool need_connect_result = true; wdev_lock(wdev); @@ -94,6 +95,14 @@ void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len) } WARN_ON(!bss); + } else if (wdev->conn) { + cfg80211_sme_failed_assoc(wdev); + need_connect_result = false; + /* + * do not call connect_result() now because the + * sme will schedule work that does it later. + */ + goto out; } if (!wdev->conn && wdev->sme_state == CFG80211_SME_IDLE) { |