cfg80211: report userspace SME connected event properly

[pandora-kernel.git] / net / wireless / mlme.c

diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index 097a87d..79d2eec 100644 (file)
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -61,32 +61,62 @@ void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len)
        struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buf;
        u8 *ie = mgmt->u.assoc_resp.variable;
        int i, ieoffs = offsetof(struct ieee80211_mgmt, u.assoc_resp.variable);
-       bool done;
+       struct cfg80211_internal_bss *bss = NULL;
 
        wdev_lock(wdev);
 
        status_code = le16_to_cpu(mgmt->u.assoc_resp.status_code);
 
-       nl80211_send_rx_assoc(rdev, dev, buf, len, GFP_KERNEL);
+       /*
+        * This is a bit of a hack, we don't notify userspace of
+        * a (re-)association reply if we tried to send a reassoc
+        * and got a reject -- we only try again with an assoc
+        * frame instead of reassoc.
+        */
+       if (status_code != WLAN_STATUS_SUCCESS && wdev->conn &&
+           cfg80211_sme_failed_reassoc(wdev))
+               goto out;
 
-       __cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, ie, len - ieoffs,
-                                 status_code,
-                                 status_code == WLAN_STATUS_SUCCESS);
+       nl80211_send_rx_assoc(rdev, dev, buf, len, GFP_KERNEL);
 
        if (status_code == WLAN_STATUS_SUCCESS) {
-               for (i = 0; wdev->current_bss && i < MAX_AUTH_BSSES; i++) {
-                       if (wdev->auth_bsses[i] == wdev->current_bss) {
-                               cfg80211_unhold_bss(wdev->auth_bsses[i]);
-                               cfg80211_put_bss(&wdev->auth_bsses[i]->pub);
+               for (i = 0; i < MAX_AUTH_BSSES; i++) {
+                       if (!wdev->auth_bsses[i])
+                               continue;
+                       if (memcmp(wdev->auth_bsses[i]->pub.bssid, mgmt->bssid,
+                                  ETH_ALEN) == 0) {
+                               bss = wdev->auth_bsses[i];
                                wdev->auth_bsses[i] = NULL;
-                               done = true;
+                               /* additional reference to drop hold */
+                               cfg80211_ref_bss(bss);
                                break;
                        }
                }
 
-               WARN_ON(!done);
+               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,
+                                 status_code == WLAN_STATUS_SUCCESS,
+                                 bss ? &bss->pub : NULL);
+       /* drop hold now, and also reference acquired above */
+       if (bss) {
+               cfg80211_unhold_bss(bss);
+               cfg80211_put_bss(&bss->pub);
+       }
+
+ out:
        wdev_unlock(wdev);
 }
 EXPORT_SYMBOL(cfg80211_send_rx_assoc);
@@ -139,12 +169,12 @@ static void __cfg80211_send_deauth(struct net_device *dev,
 
                reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
 
-               from_ap = memcmp(mgmt->da, dev->dev_addr, ETH_ALEN) == 0;
+               from_ap = memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0;
                __cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap);
        } else if (wdev->sme_state == CFG80211_SME_CONNECTING) {
                __cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, NULL, 0,
                                          WLAN_STATUS_UNSPECIFIED_FAILURE,
-                                         false);
+                                         false, NULL);
        }
 }
 
@@ -188,7 +218,7 @@ static void __cfg80211_send_disassoc(struct net_device *dev,
                return;
 
        if (wdev->current_bss &&
-           memcmp(wdev->current_bss, bssid, ETH_ALEN) == 0) {
+           memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) {
                for (i = 0; i < MAX_AUTH_BSSES; i++) {
                        if (wdev->authtry_bsses[i] || wdev->auth_bsses[i])
                                continue;
@@ -205,7 +235,7 @@ static void __cfg80211_send_disassoc(struct net_device *dev,
 
        reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
 
-       from_ap = memcmp(mgmt->da, dev->dev_addr, ETH_ALEN) == 0;
+       from_ap = memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0;
        __cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap);
 }
 
@@ -241,7 +271,7 @@ void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr)
        if (wdev->sme_state == CFG80211_SME_CONNECTING)
                __cfg80211_connect_result(dev, addr, NULL, 0, NULL, 0,
                                          WLAN_STATUS_UNSPECIFIED_FAILURE,
-                                         false);
+                                         false, NULL);
 
        for (i = 0; addr && i < MAX_AUTH_BSSES; i++) {
                if (wdev->authtry_bsses[i] &&
@@ -275,7 +305,7 @@ void cfg80211_send_assoc_timeout(struct net_device *dev, const u8 *addr)
        if (wdev->sme_state == CFG80211_SME_CONNECTING)
                __cfg80211_connect_result(dev, addr, NULL, 0, NULL, 0,
                                          WLAN_STATUS_UNSPECIFIED_FAILURE,
-                                         false);
+                                         false, NULL);
 
        for (i = 0; addr && i < MAX_AUTH_BSSES; i++) {
                if (wdev->auth_bsses[i] &&