merge sock_alloc_fd/sock_attach_fd into a new helper

[safe/jmp/linux-2.6] / net / wireless / ibss.c

diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index de9ac49..6ef5a49 100644 (file)
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -15,14 +15,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,
@@ -44,7 +44,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);
@@ -58,6 +58,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;
@@ -68,7 +70,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);
 
@@ -78,10 +80,15 @@ int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
                         struct cfg80211_cached_keys *connkeys)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
+       struct ieee80211_channel *chan;
        int err;
 
        ASSERT_WDEV_LOCK(wdev);
 
+       chan = rdev_fixed_channel(rdev, wdev);
+       if (chan && chan != params->channel)
+               return -EBUSY;
+
        if (wdev->ssid_len)
                return -EALREADY;
 
@@ -89,7 +96,7 @@ int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
                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);
@@ -112,9 +119,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;
 }
@@ -145,7 +154,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
@@ -160,8 +169,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;
@@ -194,7 +203,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)
 {
@@ -264,27 +273,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;
@@ -292,8 +306,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)
@@ -307,9 +320,11 @@ 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;
 }
@@ -347,6 +362,7 @@ int cfg80211_ibss_wext_siwessid(struct net_device *dev,
                                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;
 
@@ -354,14 +370,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)
@@ -375,14 +390,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,
@@ -410,14 +425,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;
 
@@ -425,7 +439,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)
@@ -447,8 +461,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)
@@ -460,14 +473,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,
@@ -493,6 +506,4 @@ int cfg80211_ibss_wext_giwap(struct net_device *dev,
 
        return 0;
 }
-/* temporary symbol - mark GPL - in the future the handler won't be */
-EXPORT_SYMBOL_GPL(cfg80211_ibss_wext_giwap);
 #endif