Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...

[mv-sheeva.git] / net / wireless / sme.c

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 104b33e34d22bc0f9a2e71b80d2300a148eb5857..93c3ed329204f034c18a1ec08b9d54bb75364abe 100644 (file)
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -65,7 +65,6 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev)
        if (!request)
                return -ENOMEM;
 
-       request->channels = (void *)((char *)request + sizeof(*request));
        if (wdev->conn->params.channel)
                request->channels[0] = wdev->conn->params.channel;
        else {
@@ -82,7 +81,7 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev)
                }
        }
        request->n_channels = n_channels;
-       request->ssids = (void *)(request->channels + n_channels);
+       request->ssids = (void *)&request->channels[n_channels];
        request->n_ssids = 1;
 
        memcpy(request->ssids[0].ssid, wdev->conn->params.ssid,
@@ -189,7 +188,7 @@ void cfg80211_conn_work(struct work_struct *work)
        rtnl_unlock();
 }
 
-static bool cfg80211_get_conn_bss(struct wireless_dev *wdev)
+static struct cfg80211_bss *cfg80211_get_conn_bss(struct wireless_dev *wdev)
 {
        struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
        struct cfg80211_bss *bss;
@@ -206,7 +205,7 @@ static bool cfg80211_get_conn_bss(struct wireless_dev *wdev)
                               WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_PRIVACY,
                               capa);
        if (!bss)
-               return false;
+               return NULL;
 
        memcpy(wdev->conn->bssid, bss->bssid, ETH_ALEN);
        wdev->conn->params.bssid = wdev->conn->bssid;
@@ -214,14 +213,14 @@ static bool cfg80211_get_conn_bss(struct wireless_dev *wdev)
        wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT;
        schedule_work(&rdev->conn_work);
 
-       cfg80211_put_bss(bss);
-       return true;
+       return bss;
 }
 
 static void __cfg80211_sme_scan_done(struct net_device *dev)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
+       struct cfg80211_bss *bss;
 
        ASSERT_WDEV_LOCK(wdev);
 
@@ -235,7 +234,10 @@ static void __cfg80211_sme_scan_done(struct net_device *dev)
            wdev->conn->state != CFG80211_CONN_SCAN_AGAIN)
                return;
 
-       if (!cfg80211_get_conn_bss(wdev)) {
+       bss = cfg80211_get_conn_bss(wdev);
+       if (bss) {
+               cfg80211_put_bss(bss);
+       } else {
                /* not found */
                if (wdev->conn->state == CFG80211_CONN_SCAN_AGAIN)
                        schedule_work(&rdev->conn_work);
@@ -352,15 +354,13 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION))
                return;
 
-       if (wdev->sme_state == CFG80211_SME_CONNECTED)
-               nl80211_send_roamed(wiphy_to_dev(wdev->wiphy), dev,
+       if (wdev->sme_state != CFG80211_SME_CONNECTING)
+               return;
+
+       nl80211_send_connect_result(wiphy_to_dev(wdev->wiphy), dev,
                                    bssid, req_ie, req_ie_len,
-                                   resp_ie, resp_ie_len, GFP_KERNEL);
-       else
-               nl80211_send_connect_result(wiphy_to_dev(wdev->wiphy), dev,
-                                           bssid, req_ie, req_ie_len,
-                                           resp_ie, resp_ie_len,
-                                           status, GFP_KERNEL);
+                                   resp_ie, resp_ie_len,
+                                   status, GFP_KERNEL);
 
 #ifdef CONFIG_WIRELESS_EXT
        if (wextev) {
@@ -393,18 +393,13 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
                wdev->current_bss = NULL;
        }
 
-       if (status == WLAN_STATUS_SUCCESS &&
-           wdev->sme_state == CFG80211_SME_IDLE)
-               goto success;
-
-       if (wdev->sme_state != CFG80211_SME_CONNECTING)
-               return;
-
        if (wdev->conn)
                wdev->conn->state = CFG80211_CONN_IDLE;
 
        if (status != WLAN_STATUS_SUCCESS) {
                wdev->sme_state = CFG80211_SME_IDLE;
+               if (wdev->conn)
+                       kfree(wdev->conn->ie);
                kfree(wdev->conn);
                wdev->conn = NULL;
                kfree(wdev->connect_keys);
@@ -413,7 +408,6 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
                return;
        }
 
- success:
        if (!bss)
                bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
                                       wdev->ssid, wdev->ssid_len,
@@ -454,12 +448,15 @@ void cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
        struct cfg80211_event *ev;
        unsigned long flags;
 
+       CFG80211_DEV_WARN_ON(wdev->sme_state != CFG80211_SME_CONNECTING);
+
        ev = kzalloc(sizeof(*ev) + req_ie_len + resp_ie_len, gfp);
        if (!ev)
                return;
 
        ev->type = EVENT_CONNECT_RESULT;
-       memcpy(ev->cr.bssid, bssid, ETH_ALEN);
+       if (bssid)
+               memcpy(ev->cr.bssid, bssid, ETH_ALEN);
        ev->cr.req_ie = ((u8 *)ev) + sizeof(*ev);
        ev->cr.req_ie_len = req_ie_len;
        memcpy((void *)ev->cr.req_ie, req_ie, req_ie_len);
@@ -489,7 +486,7 @@ void __cfg80211_roamed(struct wireless_dev *wdev, const u8 *bssid,
        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION))
                return;
 
-       if (WARN_ON(wdev->sme_state != CFG80211_SME_CONNECTED))
+       if (wdev->sme_state != CFG80211_SME_CONNECTED)
                return;
 
        /* internal error -- how did we get to CONNECTED w/o BSS? */
@@ -548,6 +545,8 @@ void cfg80211_roamed(struct net_device *dev, const u8 *bssid,
        struct cfg80211_event *ev;
        unsigned long flags;
 
+       CFG80211_DEV_WARN_ON(wdev->sme_state != CFG80211_SME_CONNECTED);
+
        ev = kzalloc(sizeof(*ev) + req_ie_len + resp_ie_len, gfp);
        if (!ev)
                return;
@@ -583,7 +582,7 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION))
                return;
 
-       if (WARN_ON(wdev->sme_state != CFG80211_SME_CONNECTED))
+       if (wdev->sme_state != CFG80211_SME_CONNECTED)
                return;
 
        if (wdev->current_bss) {
@@ -647,6 +646,8 @@ void cfg80211_disconnected(struct net_device *dev, u16 reason,
        struct cfg80211_event *ev;
        unsigned long flags;
 
+       CFG80211_DEV_WARN_ON(wdev->sme_state != CFG80211_SME_CONNECTED);
+
        ev = kzalloc(sizeof(*ev) + ie_len, gfp);
        if (!ev)
                return;
@@ -672,6 +673,7 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct ieee80211_channel *chan;
+       struct cfg80211_bss *bss = NULL;
        int err;
 
        ASSERT_WDEV_LOCK(wdev);
@@ -760,9 +762,8 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
                wdev->conn->params.ssid = wdev->ssid;
                wdev->conn->params.ssid_len = connect->ssid_len;
 
-               /* don't care about result -- but fill bssid & channel */
-               if (!wdev->conn->params.bssid || !wdev->conn->params.channel)
-                       cfg80211_get_conn_bss(wdev);
+               /* see if we have the bss already */
+               bss = cfg80211_get_conn_bss(wdev);
 
                wdev->sme_state = CFG80211_SME_CONNECTING;
                wdev->connect_keys = connkeys;
@@ -772,10 +773,11 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
                        wdev->conn->prev_bssid_valid = true;
                }
 
-               /* we're good if we have both BSSID and channel */
-               if (wdev->conn->params.bssid && wdev->conn->params.channel) {
+               /* we're good if we have a matching bss struct */
+               if (bss) {
                        wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT;
                        err = cfg80211_conn_do_work(wdev);
+                       cfg80211_put_bss(bss);
                } else {
                        /* otherwise we'll need to scan for the AP first */
                        err = cfg80211_conn_scan(wdev);
@@ -790,6 +792,7 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
                        }
                }
                if (err) {
+                       kfree(wdev->conn->ie);
                        kfree(wdev->conn);
                        wdev->conn = NULL;
                        wdev->sme_state = CFG80211_SME_IDLE;
@@ -859,6 +862,7 @@ int __cfg80211_disconnect(struct cfg80211_registered_device *rdev,
                    (wdev->conn->state == CFG80211_CONN_SCANNING ||
                     wdev->conn->state == CFG80211_CONN_SCAN_AGAIN)) {
                        wdev->sme_state = CFG80211_SME_IDLE;
+                       kfree(wdev->conn->ie);
                        kfree(wdev->conn);
                        wdev->conn = NULL;
                        wdev->ssid_len = 0;