diff options
author | David S. Miller <davem@davemloft.net> | 2009-08-21 01:56:56 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-21 01:56:56 -0700 |
commit | f8f2109d4f6c525f893f6f2901ae62372e83245e (patch) | |
tree | e20b095973d45eb2360ffa157ad161536c2ddbe9 /net/wireless/mlme.c | |
parent | bb81b2ddfa194b6d12761a350b5b5985cecae0a9 (diff) | |
parent | a2c3f6567c9ac327f1ef1272551f3a7595ec885e (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-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 da64071ceb8..79d2eec54ce 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c @@ -96,6 +96,15 @@ void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len) WARN_ON(!bss); } + if (!wdev->conn && wdev->sme_state == CFG80211_SME_IDLE) { + /* + * This is for the userspace SME, the CONNECTING + * state will be changed to CONNECTED by + * __cfg80211_connect_result() below. + */ + wdev->sme_state = CFG80211_SME_CONNECTING; + } + /* this consumes one bss reference (unless bss is NULL) */ __cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, ie, len - ieoffs, status_code, |