7 files changed, 83 insertions, 80 deletions

diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 5acb8140ee58..7cd9aa79ef52 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -27,75 +27,6 @@
 #include "aes_ccm.h"
 
 
-static int ieee80211_ioctl_siwfreq(struct net_device *dev,
-                                   struct iw_request_info *info,
-                                   struct iw_freq *freq, char *extra)
-{
-        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        struct ieee80211_local *local = sdata->local;
-        struct ieee80211_channel *chan;
-
-        if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
-                return cfg80211_ibss_wext_siwfreq(dev, info, freq, extra);
-        else if (sdata->vif.type == NL80211_IFTYPE_STATION)
-                return cfg80211_mgd_wext_siwfreq(dev, info, freq, extra);
-
-        /* freq->e == 0: freq->m = channel; otherwise freq = m * 10^e */
-        if (freq->e == 0) {
-                if (freq->m < 0)
-                        return -EINVAL;
-                else
-                        chan = ieee80211_get_channel(local->hw.wiphy,
-                                ieee80211_channel_to_frequency(freq->m));
-        } else {
-                int i, div = 1000000;
-                for (i = 0; i < freq->e; i++)
-                        div /= 10;
-                if (div <= 0)
-                        return -EINVAL;
-                chan = ieee80211_get_channel(local->hw.wiphy, freq->m / div);
-        }
-
-        if (!chan)
-                return -EINVAL;
-
-        if (chan->flags & IEEE80211_CHAN_DISABLED)
-                return -EINVAL;
-
-        /*
-         * no change except maybe auto -> fixed, ignore the HT
-         * setting so you can fix a channel you're on already
-         */
-        if (local->oper_channel == chan)
-                return 0;
-
-        local->oper_channel = chan;
-        local->oper_channel_type = NL80211_CHAN_NO_HT;
-        ieee80211_hw_config(local, 0);
-
-        return 0;
-}
-
-
-static int ieee80211_ioctl_giwfreq(struct net_device *dev,
-                                   struct iw_request_info *info,
-                                   struct iw_freq *freq, char *extra)
-{
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-
-        if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
-                return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);
-        else if (sdata->vif.type == NL80211_IFTYPE_STATION)
-                return cfg80211_mgd_wext_giwfreq(dev, info, freq, extra);
-
-        freq->m = local->oper_channel->center_freq;
-        freq->e = 6;
-
-        return 0;
-}
-
-
 static int ieee80211_ioctl_siwessid(struct net_device *dev,
                                     struct iw_request_info *info,
                                     struct iw_point *data, char *ssid)
@@ -173,8 +104,8 @@ static const iw_handler ieee80211_handler[] =
         (iw_handler) cfg80211_wext_giwname,             /* SIOCGIWNAME */
         (iw_handler) NULL,                              /* SIOCSIWNWID */
         (iw_handler) NULL,                              /* SIOCGIWNWID */
-        (iw_handler) ieee80211_ioctl_siwfreq,           /* SIOCSIWFREQ */
-        (iw_handler) ieee80211_ioctl_giwfreq,           /* SIOCGIWFREQ */
+        (iw_handler) cfg80211_wext_siwfreq,             /* SIOCSIWFREQ */
+        (iw_handler) cfg80211_wext_giwfreq,             /* SIOCGIWFREQ */
         (iw_handler) cfg80211_wext_siwmode,             /* SIOCSIWMODE */
         (iw_handler) cfg80211_wext_giwmode,             /* SIOCGIWMODE */
         (iw_handler) NULL,                              /* SIOCSIWSENS */
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 4276b70cd975..6d903c1d721d 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -66,6 +66,9 @@ struct cfg80211_registered_device {
         struct work_struct conn_work;
         struct work_struct event_work;
 
+        /* current channel */
+        struct ieee80211_channel *channel;
+
 #ifdef CONFIG_CFG80211_DEBUGFS
         /* Debugfs entries */
         struct wiphy_debugfsdentries {
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index 8b65e212ae49..de9ac49cd907 100644
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -7,6 +7,7 @@
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
 #include <net/cfg80211.h>
+#include "wext-compat.h"
 #include "nl80211.h"
 
 
@@ -312,8 +313,6 @@ int cfg80211_ibss_wext_siwfreq(struct net_device *dev,
 
         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,8 +341,6 @@ 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,
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index c951eb2b07d5..0cd548267d4a 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -757,6 +757,8 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
                                                 channel_type);
                 if (result)
                         goto bad_res;
+
+                rdev->channel = chan;
         }
 
         changed = 0;
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index c7351a98e660..fc2e7768967d 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -14,6 +14,7 @@
 #include <linux/etherdevice.h>
 #include <net/iw_handler.h>
 #include <net/cfg80211.h>
+#include "wext-compat.h"
 #include "core.h"
 
 int cfg80211_wext_giwname(struct net_device *dev,
@@ -300,7 +301,6 @@ struct ieee80211_channel *cfg80211_wext_freq(struct wiphy *wiphy,
                 return ERR_PTR(-EINVAL);
         return chan;
 }
-EXPORT_SYMBOL_GPL(cfg80211_wext_freq);
 
 int cfg80211_wext_siwrts(struct net_device *dev,
                          struct iw_request_info *info,
@@ -759,6 +759,58 @@ int cfg80211_wext_giwencode(struct net_device *dev,
 }
 EXPORT_SYMBOL_GPL(cfg80211_wext_giwencode);
 
+int cfg80211_wext_siwfreq(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_freq *freq, 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;
+
+        switch (wdev->iftype) {
+        case NL80211_IFTYPE_STATION:
+                return cfg80211_mgd_wext_siwfreq(dev, info, freq, extra);
+        case NL80211_IFTYPE_ADHOC:
+                return cfg80211_ibss_wext_siwfreq(dev, info, freq, extra);
+        default:
+                chan = cfg80211_wext_freq(wdev->wiphy, freq);
+                if (!chan)
+                        return -EINVAL;
+                if (IS_ERR(chan))
+                        return PTR_ERR(chan);
+                err = rdev->ops->set_channel(wdev->wiphy, chan,
+                                             NL80211_CHAN_NO_HT);
+                if (err)
+                        return err;
+                rdev->channel = chan;
+                return 0;
+        }
+}
+EXPORT_SYMBOL_GPL(cfg80211_wext_siwfreq);
+
+int cfg80211_wext_giwfreq(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_freq *freq, char *extra)
+{
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
+
+        switch (wdev->iftype) {
+        case NL80211_IFTYPE_STATION:
+                return cfg80211_mgd_wext_giwfreq(dev, info, freq, extra);
+        case NL80211_IFTYPE_ADHOC:
+                return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);
+        default:
+                if (!rdev->channel)
+                        return -EINVAL;
+                freq->m = rdev->channel->center_freq;
+                freq->e = 6;
+                return 0;
+        }
+}
+EXPORT_SYMBOL_GPL(cfg80211_wext_giwfreq);
+
 int cfg80211_wext_siwtxpower(struct net_device *dev,
                              struct iw_request_info *info,
                              union iwreq_data *data, char *extra)
diff --git a/net/wireless/wext-compat.h b/net/wireless/wext-compat.h
new file mode 100644
index 000000000000..23a6b5a83f2d
--- /dev/null
+++ b/net/wireless/wext-compat.h
@@ -0,0 +1,21 @@
+#ifndef __WEXT_COMPAT
+#define __WEXT_COMPAT
+
+int cfg80211_ibss_wext_siwfreq(struct net_device *dev,
+                               struct iw_request_info *info,
+                               struct iw_freq *freq, char *extra);
+int cfg80211_ibss_wext_giwfreq(struct net_device *dev,
+                               struct iw_request_info *info,
+                               struct iw_freq *freq, char *extra);
+
+int cfg80211_mgd_wext_siwfreq(struct net_device *dev,
+                              struct iw_request_info *info,
+                              struct iw_freq *freq, char *extra);
+int cfg80211_mgd_wext_giwfreq(struct net_device *dev,
+                              struct iw_request_info *info,
+                              struct iw_freq *freq, char *extra);
+
+struct ieee80211_channel *cfg80211_wext_freq(struct wiphy *wiphy,
+                                             struct iw_freq *freq);
+
+#endif /* __WEXT_COMPAT */
diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c
index 4c689fd865b0..509279a1cfb2 100644
--- a/net/wireless/wext-sme.c
+++ b/net/wireless/wext-sme.c
@@ -8,6 +8,7 @@
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
 #include <net/cfg80211.h>
+#include "wext-compat.h"
 #include "nl80211.h"
 
 int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
@@ -108,8 +109,6 @@ int cfg80211_mgd_wext_siwfreq(struct net_device *dev,
         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,
@@ -138,8 +137,6 @@ 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,