Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6.git] / net / wireless / wext-sme.c
index 82e913a..326750b 100644 (file)
@@ -5,15 +5,20 @@
  * Copyright (C) 2009   Intel Corporation. All rights reserved.
  */
 
+#include <linux/export.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
+#include <linux/slab.h>
 #include <net/cfg80211.h>
+#include <net/cfg80211-wext.h>
+#include "wext-compat.h"
 #include "nl80211.h"
 
 int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
                              struct wireless_dev *wdev)
 {
        struct cfg80211_cached_keys *ck = NULL;
+       const u8 *prev_bssid = NULL;
        int err, i;
 
        ASSERT_RDEV_LOCK(rdev);
@@ -24,11 +29,12 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
 
        wdev->wext.connect.ie = wdev->wext.ie;
        wdev->wext.connect.ie_len = wdev->wext.ie_len;
-       wdev->wext.connect.privacy = wdev->wext.default_key != -1;
 
        if (wdev->wext.keys) {
                wdev->wext.keys->def = wdev->wext.default_key;
                wdev->wext.keys->defmgmt = wdev->wext.default_mgmt_key;
+               if (wdev->wext.default_key != -1)
+                       wdev->wext.connect.privacy = true;
        }
 
        if (!wdev->wext.connect.ssid_len)
@@ -41,8 +47,12 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
                for (i = 0; i < 6; i++)
                        ck->params[i].key = ck->data[i];
        }
+
+       if (wdev->wext.prev_bssid_valid)
+               prev_bssid = wdev->wext.prev_bssid;
+
        err = __cfg80211_connect(rdev, wdev->netdev,
-                                &wdev->wext.connect, ck);
+                                &wdev->wext.connect, ck, prev_bssid);
        if (err)
                kfree(ck);
 
@@ -51,40 +61,46 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
 
 int cfg80211_mgd_wext_siwfreq(struct net_device *dev,
                              struct iw_request_info *info,
-                             struct iw_freq *freq, char *extra)
+                             struct iw_freq *wextfreq, char *extra)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
-       struct ieee80211_channel *chan;
-       int err;
+       struct ieee80211_channel *chan = NULL;
+       int err, freq;
 
        /* call only for station! */
        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION))
                return -EINVAL;
 
-       chan = cfg80211_wext_freq(wdev->wiphy, freq);
-       if (chan && IS_ERR(chan))
-               return PTR_ERR(chan);
+       freq = cfg80211_wext_freq(wdev->wiphy, wextfreq);
+       if (freq < 0)
+               return freq;
 
-       if (chan && (chan->flags & IEEE80211_CHAN_DISABLED))
-               return -EINVAL;
+       if (freq) {
+               chan = ieee80211_get_channel(wdev->wiphy, freq);
+               if (!chan)
+                       return -EINVAL;
+               if (chan->flags & IEEE80211_CHAN_DISABLED)
+                       return -EINVAL;
+       }
 
        cfg80211_lock_rdev(rdev);
+       mutex_lock(&rdev->devlist_mtx);
        wdev_lock(wdev);
 
-       if (wdev->wext.connect.channel == chan) {
-               err = 0;
-               goto out;
-       }
-
        if (wdev->sme_state != CFG80211_SME_IDLE) {
                bool event = true;
+
+               if (wdev->wext.connect.channel == chan) {
+                       err = 0;
+                       goto out;
+               }
+
                /* if SSID set, we'll try right again, avoid event */
                if (wdev->wext.connect.ssid_len)
                        event = false;
-               err = __cfg80211_disconnect(wiphy_to_dev(wdev->wiphy),
-                                           dev, WLAN_REASON_DEAUTH_LEAVING,
-                                           event);
+               err = __cfg80211_disconnect(rdev, dev,
+                                           WLAN_REASON_DEAUTH_LEAVING, event);
                if (err)
                        goto out;
        }
@@ -93,22 +109,18 @@ int cfg80211_mgd_wext_siwfreq(struct net_device *dev,
        wdev->wext.connect.channel = chan;
 
        /* SSID is not set, we just want to switch channel */
-       if (wdev->wext.connect.ssid_len && chan) {
-               err = -EOPNOTSUPP;
-               if (rdev->ops->set_channel)
-                       err = rdev->ops->set_channel(wdev->wiphy, chan,
-                                                    NL80211_CHAN_NO_HT);
+       if (chan && !wdev->wext.connect.ssid_len) {
+               err = cfg80211_set_freq(rdev, wdev, freq, NL80211_CHAN_NO_HT);
                goto out;
        }
 
-       err = cfg80211_mgd_wext_connect(wiphy_to_dev(wdev->wiphy), wdev);
+       err = cfg80211_mgd_wext_connect(rdev, wdev);
  out:
        wdev_unlock(wdev);
+       mutex_unlock(&rdev->devlist_mtx);
        cfg80211_unlock_rdev(rdev);
        return err;
 }
-/* temporary symbol - mark GPL - in the future the handler won't be */
-EXPORT_SYMBOL_GPL(cfg80211_mgd_wext_siwfreq);
 
 int cfg80211_mgd_wext_giwfreq(struct net_device *dev,
                              struct iw_request_info *info,
@@ -137,14 +149,13 @@ int cfg80211_mgd_wext_giwfreq(struct net_device *dev,
        /* no channel if not joining */
        return -EINVAL;
 }
-/* temporary symbol - mark GPL - in the future the handler won't be */
-EXPORT_SYMBOL_GPL(cfg80211_mgd_wext_giwfreq);
 
 int cfg80211_mgd_wext_siwessid(struct net_device *dev,
                               struct iw_request_info *info,
                               struct iw_point *data, char *ssid)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
+       struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
        size_t len = data->length;
        int err;
 
@@ -159,42 +170,45 @@ int cfg80211_mgd_wext_siwessid(struct net_device *dev,
        if (len > 0 && ssid[len - 1] == '\0')
                len--;
 
-       cfg80211_lock_rdev(wiphy_to_dev(wdev->wiphy));
+       cfg80211_lock_rdev(rdev);
+       mutex_lock(&rdev->devlist_mtx);
        wdev_lock(wdev);
 
        err = 0;
 
-       if (wdev->wext.connect.ssid && len &&
-           len == wdev->wext.connect.ssid_len &&
-           memcmp(wdev->wext.connect.ssid, ssid, len) == 0)
-               goto out;
-
        if (wdev->sme_state != CFG80211_SME_IDLE) {
                bool event = true;
+
+               if (wdev->wext.connect.ssid && len &&
+                   len == wdev->wext.connect.ssid_len &&
+                   memcmp(wdev->wext.connect.ssid, ssid, len) == 0)
+                       goto out;
+
                /* if SSID set now, we'll try to connect, avoid event */
                if (len)
                        event = false;
-               err = __cfg80211_disconnect(wiphy_to_dev(wdev->wiphy),
-                                           dev, WLAN_REASON_DEAUTH_LEAVING,
-                                           event);
+               err = __cfg80211_disconnect(rdev, dev,
+                                           WLAN_REASON_DEAUTH_LEAVING, event);
                if (err)
                        goto out;
        }
 
+       wdev->wext.prev_bssid_valid = false;
        wdev->wext.connect.ssid = wdev->wext.ssid;
        memcpy(wdev->wext.ssid, ssid, len);
        wdev->wext.connect.ssid_len = len;
 
        wdev->wext.connect.crypto.control_port = false;
+       wdev->wext.connect.crypto.control_port_ethertype =
+                                       cpu_to_be16(ETH_P_PAE);
 
-       err = cfg80211_mgd_wext_connect(wiphy_to_dev(wdev->wiphy), wdev);
+       err = cfg80211_mgd_wext_connect(rdev, wdev);
  out:
        wdev_unlock(wdev);
-       cfg80211_unlock_rdev(wiphy_to_dev(wdev->wiphy));
+       mutex_unlock(&rdev->devlist_mtx);
+       cfg80211_unlock_rdev(rdev);
        return err;
 }
-/* temporary symbol - mark GPL - in the future the handler won't be */
-EXPORT_SYMBOL_GPL(cfg80211_mgd_wext_siwessid);
 
 int cfg80211_mgd_wext_giwessid(struct net_device *dev,
                               struct iw_request_info *info,
@@ -209,24 +223,30 @@ int cfg80211_mgd_wext_giwessid(struct net_device *dev,
        data->flags = 0;
 
        wdev_lock(wdev);
-       if (wdev->wext.connect.ssid && wdev->wext.connect.ssid_len) {
+       if (wdev->current_bss) {
+               const u8 *ie = ieee80211_bss_get_ie(&wdev->current_bss->pub,
+                                                   WLAN_EID_SSID);
+               if (ie) {
+                       data->flags = 1;
+                       data->length = ie[1];
+                       memcpy(ssid, ie + 2, data->length);
+               }
+       } else if (wdev->wext.connect.ssid && wdev->wext.connect.ssid_len) {
                data->flags = 1;
                data->length = wdev->wext.connect.ssid_len;
                memcpy(ssid, wdev->wext.connect.ssid, data->length);
-       } else
-               data->flags = 0;
+       }
        wdev_unlock(wdev);
 
        return 0;
 }
-/* temporary symbol - mark GPL - in the future the handler won't be */
-EXPORT_SYMBOL_GPL(cfg80211_mgd_wext_giwessid);
 
 int cfg80211_mgd_wext_siwap(struct net_device *dev,
                            struct iw_request_info *info,
                            struct sockaddr *ap_addr, char *extra)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
+       struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
        u8 *bssid = ap_addr->sa_data;
        int err;
 
@@ -241,23 +261,23 @@ int cfg80211_mgd_wext_siwap(struct net_device *dev,
        if (is_zero_ether_addr(bssid) || is_broadcast_ether_addr(bssid))
                bssid = NULL;
 
-       cfg80211_lock_rdev(wiphy_to_dev(wdev->wiphy));
+       cfg80211_lock_rdev(rdev);
+       mutex_lock(&rdev->devlist_mtx);
        wdev_lock(wdev);
 
-       err = 0;
-       /* both automatic */
-       if (!bssid && !wdev->wext.connect.bssid)
-               goto out;
+       if (wdev->sme_state != CFG80211_SME_IDLE) {
+               err = 0;
+               /* both automatic */
+               if (!bssid && !wdev->wext.connect.bssid)
+                       goto out;
 
-       /* fixed already - and no change */
-       if (wdev->wext.connect.bssid && bssid &&
-           compare_ether_addr(bssid, wdev->wext.connect.bssid) == 0)
-               goto out;
+               /* fixed already - and no change */
+               if (wdev->wext.connect.bssid && bssid &&
+                   compare_ether_addr(bssid, wdev->wext.connect.bssid) == 0)
+                       goto out;
 
-       if (wdev->sme_state != CFG80211_SME_IDLE) {
-               err = __cfg80211_disconnect(wiphy_to_dev(wdev->wiphy),
-                                           dev, WLAN_REASON_DEAUTH_LEAVING,
-                                           false);
+               err = __cfg80211_disconnect(rdev, dev,
+                                           WLAN_REASON_DEAUTH_LEAVING, false);
                if (err)
                        goto out;
        }
@@ -268,14 +288,13 @@ int cfg80211_mgd_wext_siwap(struct net_device *dev,
        } else
                wdev->wext.connect.bssid = NULL;
 
-       err = cfg80211_mgd_wext_connect(wiphy_to_dev(wdev->wiphy), wdev);
+       err = cfg80211_mgd_wext_connect(rdev, wdev);
  out:
        wdev_unlock(wdev);
-       cfg80211_unlock_rdev(wiphy_to_dev(wdev->wiphy));
+       mutex_unlock(&rdev->devlist_mtx);
+       cfg80211_unlock_rdev(rdev);
        return err;
 }
-/* temporary symbol - mark GPL - in the future the handler won't be */
-EXPORT_SYMBOL_GPL(cfg80211_mgd_wext_siwap);
 
 int cfg80211_mgd_wext_giwap(struct net_device *dev,
                            struct iw_request_info *info,
@@ -292,16 +311,12 @@ int cfg80211_mgd_wext_giwap(struct net_device *dev,
        wdev_lock(wdev);
        if (wdev->current_bss)
                memcpy(ap_addr->sa_data, wdev->current_bss->pub.bssid, ETH_ALEN);
-       else if (wdev->wext.connect.bssid)
-               memcpy(ap_addr->sa_data, wdev->wext.connect.bssid, ETH_ALEN);
        else
                memset(ap_addr->sa_data, 0, ETH_ALEN);
        wdev_unlock(wdev);
 
        return 0;
 }
-/* temporary symbol - mark GPL - in the future the handler won't be */
-EXPORT_SYMBOL_GPL(cfg80211_mgd_wext_giwap);
 
 int cfg80211_wext_siwgenie(struct net_device *dev,
                           struct iw_request_info *info,
@@ -352,7 +367,6 @@ int cfg80211_wext_siwgenie(struct net_device *dev,
        wdev_unlock(wdev);
        return err;
 }
-EXPORT_SYMBOL_GPL(cfg80211_wext_siwgenie);
 
 int cfg80211_wext_siwmlme(struct net_device *dev,
                          struct iw_request_info *info,
@@ -389,4 +403,3 @@ int cfg80211_wext_siwmlme(struct net_device *dev,
 
        return err;
 }
-EXPORT_SYMBOL_GPL(cfg80211_wext_siwmlme);