From c4351fe3d49b38f2083ecd6cda97e192690361c5 Mon Sep 17 00:00:00 2001 From: Raja Mani Date: Thu, 4 Aug 2011 19:26:29 +0530 Subject: [PATCH] --- yaml --- r: 265487 b: refs/heads/master c: 9aa603578f401d94a9d4ddd8af2917f224756b3b h: refs/heads/master i: 265485: 3c76c3fe5c4633bffff6ec9bd7d344cbe42ada09 265483: 18cc91a87457c4dcb633d68aa234754d86d6f5e3 265479: 0cb601de511be346b453481b034c6e330fea3d94 265471: 771a27707552047ac97519729e20d0b85a727781 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 59cc2b6b8a73..68c13f94566c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91db35dae52d2cd0b5be90e01cff343dc65b981d +refs/heads/master: 9aa603578f401d94a9d4ddd8af2917f224756b3b diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c index dc299a6b59c8..14559ffb1453 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -559,14 +559,14 @@ void ath6kl_cfg80211_connect_event(struct ath6kl *ar, u16 channel, return; } - if (!test_bit(CONNECTED, &ar->flag)) { + if (ar->sme_state == SME_CONNECTING) { /* inform connect result to cfg80211 */ - ar->sme_state = SME_DISCONNECTED; + ar->sme_state = SME_CONNECTED; cfg80211_connect_result(ar->net_dev, bssid, assoc_req_ie, assoc_req_len, assoc_resp_ie, assoc_resp_len, WLAN_STATUS_SUCCESS, GFP_KERNEL); - } else { + } else if (ar->sme_state == SME_CONNECTED) { /* inform roam event to cfg80211 */ cfg80211_roamed(ar->net_dev, ibss_ch, bssid, assoc_req_ie, assoc_req_len,