mac80211: Let userspace send action frames over mesh interfaces
[linux-2.6.git] / net / wireless / ibss.c
index c92b542..f33fbb7 100644 (file)
@@ -6,22 +6,24 @@
 
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
+#include <linux/slab.h>
 #include <net/cfg80211.h>
+#include "wext-compat.h"
 #include "nl80211.h"
 
 
-void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp)
+void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_bss *bss;
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
        union iwreq_data wrqu;
 #endif
 
        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_ADHOC))
                return;
 
-       if (WARN_ON(!wdev->ssid_len))
+       if (!wdev->ssid_len)
                return;
 
        bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
@@ -39,32 +41,84 @@ void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp)
        cfg80211_hold_bss(bss_from_pub(bss));
        wdev->current_bss = bss_from_pub(bss);
 
-       nl80211_send_ibss_bssid(wiphy_to_dev(wdev->wiphy), dev, bssid, gfp);
-#ifdef CONFIG_WIRELESS_EXT
+       cfg80211_upload_connect_keys(wdev);
+
+       nl80211_send_ibss_bssid(wiphy_to_dev(wdev->wiphy), dev, bssid,
+                               GFP_KERNEL);
+#ifdef CONFIG_CFG80211_WEXT
        memset(&wrqu, 0, sizeof(wrqu));
        memcpy(wrqu.ap_addr.sa_data, bssid, ETH_ALEN);
        wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
 #endif
 }
+
+void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp)
+{
+       struct wireless_dev *wdev = dev->ieee80211_ptr;
+       struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
+       struct cfg80211_event *ev;
+       unsigned long flags;
+
+       CFG80211_DEV_WARN_ON(!wdev->ssid_len);
+
+       ev = kzalloc(sizeof(*ev), gfp);
+       if (!ev)
+               return;
+
+       ev->type = EVENT_IBSS_JOINED;
+       memcpy(ev->cr.bssid, bssid, ETH_ALEN);
+
+       spin_lock_irqsave(&wdev->event_lock, flags);
+       list_add_tail(&ev->list, &wdev->event_list);
+       spin_unlock_irqrestore(&wdev->event_lock, flags);
+       queue_work(cfg80211_wq, &rdev->event_work);
+}
 EXPORT_SYMBOL(cfg80211_ibss_joined);
 
-int cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
-                      struct net_device *dev,
-                      struct cfg80211_ibss_params *params)
+int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
+                        struct net_device *dev,
+                        struct cfg80211_ibss_params *params,
+                        struct cfg80211_cached_keys *connkeys)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        int err;
 
+       ASSERT_WDEV_LOCK(wdev);
+
        if (wdev->ssid_len)
                return -EALREADY;
 
-#ifdef CONFIG_WIRELESS_EXT
+       if (!params->basic_rates) {
+               /*
+               * If no rates were explicitly configured,
+               * use the mandatory rate set for 11b or
+               * 11a for maximum compatibility.
+               */
+               struct ieee80211_supported_band *sband =
+                       rdev->wiphy.bands[params->channel->band];
+               int j;
+               u32 flag = params->channel->band == IEEE80211_BAND_5GHZ ?
+                       IEEE80211_RATE_MANDATORY_A :
+                       IEEE80211_RATE_MANDATORY_B;
+
+               for (j = 0; j < sband->n_bitrates; j++) {
+                       if (sband->bitrates[j].flags & flag)
+                               params->basic_rates |= BIT(j);
+               }
+       }
+
+       if (WARN_ON(wdev->connect_keys))
+               kfree(wdev->connect_keys);
+       wdev->connect_keys = connkeys;
+
+#ifdef CONFIG_CFG80211_WEXT
        wdev->wext.ibss.channel = params->channel;
 #endif
        err = rdev->ops->join_ibss(&rdev->wiphy, dev, params);
-
-       if (err)
+       if (err) {
+               wdev->connect_keys = NULL;
                return err;
+       }
 
        memcpy(wdev->ssid, params->ssid, params->ssid_len);
        wdev->ssid_len = params->ssid_len;
@@ -72,9 +126,41 @@ int cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
        return 0;
 }
 
-void cfg80211_clear_ibss(struct net_device *dev, bool nowext)
+int cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
+                      struct net_device *dev,
+                      struct cfg80211_ibss_params *params,
+                      struct cfg80211_cached_keys *connkeys)
+{
+       struct wireless_dev *wdev = dev->ieee80211_ptr;
+       int err;
+
+       mutex_lock(&rdev->devlist_mtx);
+       wdev_lock(wdev);
+       err = __cfg80211_join_ibss(rdev, dev, params, connkeys);
+       wdev_unlock(wdev);
+       mutex_unlock(&rdev->devlist_mtx);
+
+       return err;
+}
+
+static void __cfg80211_clear_ibss(struct net_device *dev, bool nowext)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
+       struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
+       int i;
+
+       ASSERT_WDEV_LOCK(wdev);
+
+       kfree(wdev->connect_keys);
+       wdev->connect_keys = NULL;
+
+       /*
+        * Delete all the keys ... pairwise keys can't really
+        * exist any more anyway, but default keys might.
+        */
+       if (rdev->ops->del_key)
+               for (i = 0; i < 6; i++)
+                       rdev->ops->del_key(wdev->wiphy, dev, i, false, NULL);
 
        if (wdev->current_bss) {
                cfg80211_unhold_bss(wdev->current_bss);
@@ -83,33 +169,64 @@ void cfg80211_clear_ibss(struct net_device *dev, bool nowext)
 
        wdev->current_bss = NULL;
        wdev->ssid_len = 0;
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
        if (!nowext)
                wdev->wext.ibss.ssid_len = 0;
 #endif
 }
 
-int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
-                       struct net_device *dev, bool nowext)
+void cfg80211_clear_ibss(struct net_device *dev, bool nowext)
+{
+       struct wireless_dev *wdev = dev->ieee80211_ptr;
+
+       wdev_lock(wdev);
+       __cfg80211_clear_ibss(dev, nowext);
+       wdev_unlock(wdev);
+}
+
+int __cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
+                         struct net_device *dev, bool nowext)
 {
+       struct wireless_dev *wdev = dev->ieee80211_ptr;
        int err;
 
+       ASSERT_WDEV_LOCK(wdev);
+
+       if (!wdev->ssid_len)
+               return -ENOLINK;
+
        err = rdev->ops->leave_ibss(&rdev->wiphy, dev);
 
        if (err)
                return err;
 
-       cfg80211_clear_ibss(dev, nowext);
+       __cfg80211_clear_ibss(dev, nowext);
 
        return 0;
 }
 
-#ifdef CONFIG_WIRELESS_EXT
-static int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
-                                  struct wireless_dev *wdev)
+int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
+                       struct net_device *dev, bool nowext)
+{
+       struct wireless_dev *wdev = dev->ieee80211_ptr;
+       int err;
+
+       wdev_lock(wdev);
+       err = __cfg80211_leave_ibss(rdev, dev, nowext);
+       wdev_unlock(wdev);
+
+       return err;
+}
+
+#ifdef CONFIG_CFG80211_WEXT
+int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
+                           struct wireless_dev *wdev)
 {
+       struct cfg80211_cached_keys *ck = NULL;
        enum ieee80211_band band;
-       int i;
+       int i, err;
+
+       ASSERT_WDEV_LOCK(wdev);
 
        if (!wdev->wext.ibss.beacon_interval)
                wdev->wext.ibss.beacon_interval = 100;
@@ -149,43 +266,68 @@ static int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
        if (!netif_running(wdev->netdev))
                return 0;
 
-       return cfg80211_join_ibss(wiphy_to_dev(wdev->wiphy),
-                                 wdev->netdev, &wdev->wext.ibss);
+       if (wdev->wext.keys) {
+               wdev->wext.keys->def = wdev->wext.default_key;
+               wdev->wext.keys->defmgmt = wdev->wext.default_mgmt_key;
+       }
+
+       wdev->wext.ibss.privacy = wdev->wext.default_key != -1;
+
+       if (wdev->wext.keys) {
+               ck = kmemdup(wdev->wext.keys, sizeof(*ck), GFP_KERNEL);
+               if (!ck)
+                       return -ENOMEM;
+               for (i = 0; i < 6; i++)
+                       ck->params[i].key = ck->data[i];
+       }
+       err = __cfg80211_join_ibss(rdev, wdev->netdev,
+                                  &wdev->wext.ibss, ck);
+       if (err)
+               kfree(ck);
+
+       return err;
 }
 
 int cfg80211_ibss_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 ieee80211_channel *chan;
-       int err;
+       struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
+       struct ieee80211_channel *chan = NULL;
+       int err, freq;
 
        /* call only for ibss! */
        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_ADHOC))
                return -EINVAL;
 
-       if (!wiphy_to_dev(wdev->wiphy)->ops->join_ibss)
+       if (!rdev->ops->join_ibss)
                return -EOPNOTSUPP;
 
-       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_NO_IBSS ||
-            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_NO_IBSS ||
+                   chan->flags & IEEE80211_CHAN_DISABLED)
+                       return -EINVAL;
+       }
 
        if (wdev->wext.ibss.channel == chan)
                return 0;
 
-       if (wdev->ssid_len) {
-               err = cfg80211_leave_ibss(wiphy_to_dev(wdev->wiphy),
-                                         dev, true);
-               if (err)
-                       return err;
-       }
+       wdev_lock(wdev);
+       err = 0;
+       if (wdev->ssid_len)
+               err = __cfg80211_leave_ibss(rdev, dev, true);
+       wdev_unlock(wdev);
+
+       if (err)
+               return err;
 
        if (chan) {
                wdev->wext.ibss.channel = chan;
@@ -195,10 +337,14 @@ int cfg80211_ibss_wext_siwfreq(struct net_device *dev,
                wdev->wext.ibss.channel_fixed = false;
        }
 
-       return cfg80211_ibss_wext_join(wiphy_to_dev(wdev->wiphy), wdev);
+       mutex_lock(&rdev->devlist_mtx);
+       wdev_lock(wdev);
+       err = cfg80211_ibss_wext_join(rdev, wdev);
+       wdev_unlock(wdev);
+       mutex_unlock(&rdev->devlist_mtx);
+
+       return err;
 }
-/* temporary symbol - mark GPL - in the future the handler won't be */
-EXPORT_SYMBOL_GPL(cfg80211_ibss_wext_siwfreq);
 
 int cfg80211_ibss_wext_giwfreq(struct net_device *dev,
                               struct iw_request_info *info,
@@ -211,10 +357,12 @@ int cfg80211_ibss_wext_giwfreq(struct net_device *dev,
        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_ADHOC))
                return -EINVAL;
 
+       wdev_lock(wdev);
        if (wdev->current_bss)
                chan = wdev->current_bss->pub.channel;
        else if (wdev->wext.ibss.channel)
                chan = wdev->wext.ibss.channel;
+       wdev_unlock(wdev);
 
        if (chan) {
                freq->m = chan->center_freq;
@@ -225,14 +373,13 @@ int cfg80211_ibss_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_ibss_wext_giwfreq);
 
 int cfg80211_ibss_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;
 
@@ -240,15 +387,17 @@ int cfg80211_ibss_wext_siwessid(struct net_device *dev,
        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_ADHOC))
                return -EINVAL;
 
-       if (!wiphy_to_dev(wdev->wiphy)->ops->join_ibss)
+       if (!rdev->ops->join_ibss)
                return -EOPNOTSUPP;
 
-       if (wdev->ssid_len) {
-               err = cfg80211_leave_ibss(wiphy_to_dev(wdev->wiphy),
-                                         dev, true);
-               if (err)
-                       return err;
-       }
+       wdev_lock(wdev);
+       err = 0;
+       if (wdev->ssid_len)
+               err = __cfg80211_leave_ibss(rdev, dev, true);
+       wdev_unlock(wdev);
+
+       if (err)
+               return err;
 
        /* iwconfig uses nul termination in SSID.. */
        if (len > 0 && ssid[len - 1] == '\0')
@@ -258,10 +407,14 @@ int cfg80211_ibss_wext_siwessid(struct net_device *dev,
        memcpy(wdev->wext.ibss.ssid, ssid, len);
        wdev->wext.ibss.ssid_len = len;
 
-       return cfg80211_ibss_wext_join(wiphy_to_dev(wdev->wiphy), wdev);
+       mutex_lock(&rdev->devlist_mtx);
+       wdev_lock(wdev);
+       err = cfg80211_ibss_wext_join(rdev, wdev);
+       wdev_unlock(wdev);
+       mutex_unlock(&rdev->devlist_mtx);
+
+       return err;
 }
-/* temporary symbol - mark GPL - in the future the handler won't be */
-EXPORT_SYMBOL_GPL(cfg80211_ibss_wext_siwessid);
 
 int cfg80211_ibss_wext_giwessid(struct net_device *dev,
                                struct iw_request_info *info,
@@ -275,6 +428,7 @@ int cfg80211_ibss_wext_giwessid(struct net_device *dev,
 
        data->flags = 0;
 
+       wdev_lock(wdev);
        if (wdev->ssid_len) {
                data->flags = 1;
                data->length = wdev->ssid_len;
@@ -284,17 +438,17 @@ int cfg80211_ibss_wext_giwessid(struct net_device *dev,
                data->length = wdev->wext.ibss.ssid_len;
                memcpy(ssid, wdev->wext.ibss.ssid, data->length);
        }
+       wdev_unlock(wdev);
 
        return 0;
 }
-/* temporary symbol - mark GPL - in the future the handler won't be */
-EXPORT_SYMBOL_GPL(cfg80211_ibss_wext_giwessid);
 
 int cfg80211_ibss_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;
 
@@ -302,7 +456,7 @@ int cfg80211_ibss_wext_siwap(struct net_device *dev,
        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_ADHOC))
                return -EINVAL;
 
-       if (!wiphy_to_dev(wdev->wiphy)->ops->join_ibss)
+       if (!rdev->ops->join_ibss)
                return -EOPNOTSUPP;
 
        if (ap_addr->sa_family != ARPHRD_ETHER)
@@ -321,12 +475,14 @@ int cfg80211_ibss_wext_siwap(struct net_device *dev,
            compare_ether_addr(bssid, wdev->wext.ibss.bssid) == 0)
                return 0;
 
-       if (wdev->ssid_len) {
-               err = cfg80211_leave_ibss(wiphy_to_dev(wdev->wiphy),
-                                         dev, true);
-               if (err)
-                       return err;
-       }
+       wdev_lock(wdev);
+       err = 0;
+       if (wdev->ssid_len)
+               err = __cfg80211_leave_ibss(rdev, dev, true);
+       wdev_unlock(wdev);
+
+       if (err)
+               return err;
 
        if (bssid) {
                memcpy(wdev->wext.bssid, bssid, ETH_ALEN);
@@ -334,10 +490,14 @@ int cfg80211_ibss_wext_siwap(struct net_device *dev,
        } else
                wdev->wext.ibss.bssid = NULL;
 
-       return cfg80211_ibss_wext_join(wiphy_to_dev(wdev->wiphy), wdev);
+       mutex_lock(&rdev->devlist_mtx);
+       wdev_lock(wdev);
+       err = cfg80211_ibss_wext_join(rdev, wdev);
+       wdev_unlock(wdev);
+       mutex_unlock(&rdev->devlist_mtx);
+
+       return err;
 }
-/* temporary symbol - mark GPL - in the future the handler won't be */
-EXPORT_SYMBOL_GPL(cfg80211_ibss_wext_siwap);
 
 int cfg80211_ibss_wext_giwap(struct net_device *dev,
                             struct iw_request_info *info,
@@ -351,12 +511,16 @@ int cfg80211_ibss_wext_giwap(struct net_device *dev,
 
        ap_addr->sa_family = ARPHRD_ETHER;
 
+       wdev_lock(wdev);
        if (wdev->current_bss)
                memcpy(ap_addr->sa_data, wdev->current_bss->pub.bssid, ETH_ALEN);
-       else
+       else if (wdev->wext.ibss.bssid)
                memcpy(ap_addr->sa_data, wdev->wext.ibss.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_ibss_wext_giwap);
 #endif