cfg80211: combine iwfreq implementations

Until now we implemented iwfreq for managed mode, we
needed to keep the implementations separate, but now
that we have all versions implemented we can combine
them and export just one handler.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwmc3200wifi/wext.c b/drivers/net/wireless/iwmc3200wifi/wext.c
index c3c90d5963bfec802afaef9ee5d7401b2a7f7d18..8058e9991c30d3d5e7138081caf0ad2a1fc61d0c 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/wext.c
+++ b/drivers/net/wireless/iwmc3200wifi/wext.c
@@ -27,36 +27,6 @@
 #include "iwm.h"
 #include "commands.h"
 
-static int iwm_wext_siwfreq(struct net_device *dev,
-                           struct iw_request_info *info,
-                           struct iw_freq *freq, char *extra)
-{
-       struct iwm_priv *iwm = ndev_to_iwm(dev);
-
-       switch (iwm->conf.mode) {
-       case UMAC_MODE_IBSS:
-               return cfg80211_ibss_wext_siwfreq(dev, info, freq, extra);
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static int iwm_wext_giwfreq(struct net_device *dev,
-                           struct iw_request_info *info,
-                           struct iw_freq *freq, char *extra)
-{
-       struct iwm_priv *iwm = ndev_to_iwm(dev);
-
-       switch (iwm->conf.mode) {
-       case UMAC_MODE_IBSS:
-               return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);
-       case UMAC_MODE_BSS:
-               return cfg80211_mgd_wext_giwfreq(dev, info, freq, extra);
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
 static int iwm_wext_siwap(struct net_device *dev, struct iw_request_info *info,
                          struct sockaddr *ap_addr, char *extra)
 {
@@ -125,8 +95,8 @@ static const iw_handler iwm_handlers[] =
        (iw_handler) cfg80211_wext_giwname,             /* SIOCGIWNAME */
        (iw_handler) NULL,                              /* SIOCSIWNWID */
        (iw_handler) NULL,                              /* SIOCGIWNWID */
-       (iw_handler) iwm_wext_siwfreq,                  /* SIOCSIWFREQ */
-       (iw_handler) iwm_wext_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/include/net/cfg80211.h b/include/net/cfg80211.h
index 0d278777e39c4067f55e1fa2f5b02ddf0f92047e..5d249c4bf225c8e3923229a766ec4fcfb7d849ef 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1595,12 +1595,6 @@ int cfg80211_wext_siwmlme(struct net_device *dev,
 int cfg80211_wext_giwrange(struct net_device *dev,
                           struct iw_request_info *info,
                           struct iw_point *data, char *extra);
-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_ibss_wext_siwessid(struct net_device *dev,
                                struct iw_request_info *info,
                                struct iw_point *data, char *ssid);
@@ -1614,12 +1608,6 @@ int cfg80211_ibss_wext_giwap(struct net_device *dev,
                             struct iw_request_info *info,
                             struct sockaddr *ap_addr, 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);
 int cfg80211_mgd_wext_siwessid(struct net_device *dev,
                               struct iw_request_info *info,
                               struct iw_point *data, char *ssid);
@@ -1642,8 +1630,12 @@ int cfg80211_wext_giwauth(struct net_device *dev,
                          struct iw_request_info *info,
                          struct iw_param *data, char *extra);
 
-struct ieee80211_channel *cfg80211_wext_freq(struct wiphy *wiphy,
-                                            struct iw_freq *freq);
+int cfg80211_wext_siwfreq(struct net_device *dev,
+                         struct iw_request_info *info,
+                         struct iw_freq *freq, char *extra);
+int cfg80211_wext_giwfreq(struct net_device *dev,
+                         struct iw_request_info *info,
+                         struct iw_freq *freq, char *extra);
 
 int cfg80211_wext_siwrate(struct net_device *dev,
                          struct iw_request_info *info,

diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 5acb8140ee5813920cc0ab8e36f20b3a1d2dd558..7cd9aa79ef528746af720ad6e439e7cffdd550aa 100644 (file)
--- 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 4276b70cd975d995d554e45ed283874bfa73880a..6d903c1d721dae0827b70560bdc6c0316cc94bfb 100644 (file)
--- 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 8b65e212ae49b9942347128e54fd249017dbef70..de9ac49cd907c985862676e032becdc10a790e0b 100644 (file)
--- 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 c951eb2b07d5864d851bda1b2c6380fd1061347a..0cd548267d4a717a11e636dce9d548dd03ebd7ea 100644 (file)
--- 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 c7351a98e6609e953a5793f05fb97534a7d8da59..fc2e7768967d70eab8ad375caae689c8e199c928 100644 (file)
--- 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 (file)
index 0000000..23a6b5a
--- /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 4c689fd865b0e586ec57f4f9fd17b9d17df80347..509279a1cfb2ccb68cbc8cb8910f0d5a792ca017 100644 (file)
--- 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,