mac80211: Let userspace send action frames over mesh interfaces
[linux-2.6.git] / net / wireless / ibss.c
index 9394e78..f33fbb7 100644 (file)
@@ -6,7 +6,9 @@
 
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
+#include <linux/slab.h>
 #include <net/cfg80211.h>
+#include "wext-compat.h"
 #include "nl80211.h"
 
 
@@ -14,14 +16,14 @@ 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,
@@ -43,7 +45,7 @@ void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid)
 
        nl80211_send_ibss_bssid(wiphy_to_dev(wdev->wiphy), dev, bssid,
                                GFP_KERNEL);
-#ifdef CONFIG_WIRELESS_EXT
+#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);
@@ -57,6 +59,8 @@ void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp)
        struct cfg80211_event *ev;
        unsigned long flags;
 
+       CFG80211_DEV_WARN_ON(!wdev->ssid_len);
+
        ev = kzalloc(sizeof(*ev), gfp);
        if (!ev)
                return;
@@ -67,7 +71,7 @@ void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp)
        spin_lock_irqsave(&wdev->event_lock, flags);
        list_add_tail(&ev->list, &wdev->event_list);
        spin_unlock_irqrestore(&wdev->event_lock, flags);
-       schedule_work(&rdev->event_work);
+       queue_work(cfg80211_wq, &rdev->event_work);
 }
 EXPORT_SYMBOL(cfg80211_ibss_joined);
 
@@ -84,11 +88,30 @@ int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
        if (wdev->ssid_len)
                return -EALREADY;
 
+       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_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
        wdev->wext.ibss.channel = params->channel;
 #endif
        err = rdev->ops->join_ibss(&rdev->wiphy, dev, params);
@@ -111,9 +134,11 @@ int cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
        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;
 }
@@ -135,7 +160,7 @@ static void __cfg80211_clear_ibss(struct net_device *dev, bool nowext)
         */
        if (rdev->ops->del_key)
                for (i = 0; i < 6; i++)
-                       rdev->ops->del_key(wdev->wiphy, dev, i, NULL);
+                       rdev->ops->del_key(wdev->wiphy, dev, i, false, NULL);
 
        if (wdev->current_bss) {
                cfg80211_unhold_bss(wdev->current_bss);
@@ -144,7 +169,7 @@ static 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
@@ -159,8 +184,8 @@ void cfg80211_clear_ibss(struct net_device *dev, bool nowext)
        wdev_unlock(wdev);
 }
 
-static int __cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
-                                struct net_device *dev, bool nowext)
+int __cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
+                         struct net_device *dev, bool nowext)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        int err;
@@ -193,7 +218,7 @@ int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
        return err;
 }
 
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
 int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
                            struct wireless_dev *wdev)
 {
@@ -241,8 +266,10 @@ int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
        if (!netif_running(wdev->netdev))
                return 0;
 
-       if (wdev->wext.keys)
+       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;
 
@@ -263,27 +290,32 @@ int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
 
 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;
@@ -291,8 +323,7 @@ int cfg80211_ibss_wext_siwfreq(struct net_device *dev,
        wdev_lock(wdev);
        err = 0;
        if (wdev->ssid_len)
-               err = __cfg80211_leave_ibss(wiphy_to_dev(wdev->wiphy),
-                                           dev, true);
+               err = __cfg80211_leave_ibss(rdev, dev, true);
        wdev_unlock(wdev);
 
        if (err)
@@ -306,14 +337,14 @@ int cfg80211_ibss_wext_siwfreq(struct net_device *dev,
                wdev->wext.ibss.channel_fixed = false;
        }
 
+       mutex_lock(&rdev->devlist_mtx);
        wdev_lock(wdev);
-       err = cfg80211_ibss_wext_join(wiphy_to_dev(wdev->wiphy), 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,
@@ -342,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;
 
@@ -357,14 +387,13 @@ 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;
 
        wdev_lock(wdev);
        err = 0;
        if (wdev->ssid_len)
-               err = __cfg80211_leave_ibss(wiphy_to_dev(wdev->wiphy),
-                                           dev, true);
+               err = __cfg80211_leave_ibss(rdev, dev, true);
        wdev_unlock(wdev);
 
        if (err)
@@ -378,14 +407,14 @@ int cfg80211_ibss_wext_siwessid(struct net_device *dev,
        memcpy(wdev->wext.ibss.ssid, ssid, len);
        wdev->wext.ibss.ssid_len = len;
 
+       mutex_lock(&rdev->devlist_mtx);
        wdev_lock(wdev);
-       err = cfg80211_ibss_wext_join(wiphy_to_dev(wdev->wiphy), 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,
@@ -413,14 +442,13 @@ int cfg80211_ibss_wext_giwessid(struct net_device *dev,
 
        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;
 
@@ -428,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)
@@ -450,8 +478,7 @@ int cfg80211_ibss_wext_siwap(struct net_device *dev,
        wdev_lock(wdev);
        err = 0;
        if (wdev->ssid_len)
-               err = __cfg80211_leave_ibss(wiphy_to_dev(wdev->wiphy),
-                                           dev, true);
+               err = __cfg80211_leave_ibss(rdev, dev, true);
        wdev_unlock(wdev);
 
        if (err)
@@ -463,14 +490,14 @@ int cfg80211_ibss_wext_siwap(struct net_device *dev,
        } else
                wdev->wext.ibss.bssid = NULL;
 
+       mutex_lock(&rdev->devlist_mtx);
        wdev_lock(wdev);
-       err = cfg80211_ibss_wext_join(wiphy_to_dev(wdev->wiphy), 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,
@@ -487,12 +514,13 @@ int cfg80211_ibss_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
+       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