cfg80211: move cfg80211_get_dev_from_ifindex under wext

The function is only used and needed by the wext code
for scanning, so move it there.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 58e69d691601811c90d6be1ca7efd4558b91ff78..cc49cf11c7a7b5d75907e4f42d531ff1b100d099 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -90,27 +90,6 @@ struct wiphy *wiphy_idx_to_wiphy(int wiphy_idx)
        return &rdev->wiphy;
 }
 
-struct cfg80211_registered_device *
-cfg80211_get_dev_from_ifindex(struct net *net, int ifindex)
-{
-       struct cfg80211_registered_device *rdev = ERR_PTR(-ENODEV);
-       struct net_device *dev;
-
-       mutex_lock(&cfg80211_mutex);
-       dev = dev_get_by_index(net, ifindex);
-       if (!dev)
-               goto out;
-       if (dev->ieee80211_ptr) {
-               rdev = wiphy_to_dev(dev->ieee80211_ptr->wiphy);
-               mutex_lock(&rdev->mtx);
-       } else
-               rdev = ERR_PTR(-ENODEV);
-       dev_put(dev);
- out:
-       mutex_unlock(&cfg80211_mutex);
-       return rdev;
-}
-
 /* requires cfg80211_mutex to be held */
 int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
                        char *newname)

diff --git a/net/wireless/core.h b/net/wireless/core.h
index fd35dae547c446cbae459e0ea8c3f679320b952c..95b29075a9c897756e1c0de45f5aaf95b7e8c546 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -164,10 +164,6 @@ int get_wiphy_idx(struct wiphy *wiphy);
 /* requires cfg80211_rdev_mutex to be held! */
 struct wiphy *wiphy_idx_to_wiphy(int wiphy_idx);
 
-/* identical to cfg80211_get_dev_from_info but only operate on ifindex */
-extern struct cfg80211_registered_device *
-cfg80211_get_dev_from_ifindex(struct net *net, int ifindex);
-
 int cfg80211_switch_netns(struct cfg80211_registered_device *rdev,
                          struct net *net);
 

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index fd99ea495b7e68cd9e5265542a6aa059d0ac7760..2ce44a712f13cc65ae9dbbfa66a5bbfdc3423c29 100644 (file)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -1040,6 +1040,27 @@ void cfg80211_unlink_bss(struct wiphy *wiphy, struct cfg80211_bss *pub)
 EXPORT_SYMBOL(cfg80211_unlink_bss);
 
 #ifdef CONFIG_CFG80211_WEXT
+static struct cfg80211_registered_device *
+cfg80211_get_dev_from_ifindex(struct net *net, int ifindex)
+{
+       struct cfg80211_registered_device *rdev = ERR_PTR(-ENODEV);
+       struct net_device *dev;
+
+       mutex_lock(&cfg80211_mutex);
+       dev = dev_get_by_index(net, ifindex);
+       if (!dev)
+               goto out;
+       if (dev->ieee80211_ptr) {
+               rdev = wiphy_to_dev(dev->ieee80211_ptr->wiphy);
+               mutex_lock(&rdev->mtx);
+       } else
+               rdev = ERR_PTR(-ENODEV);
+       dev_put(dev);
+ out:
+       mutex_unlock(&cfg80211_mutex);
+       return rdev;
+}
+
 int cfg80211_wext_siwscan(struct net_device *dev,
                          struct iw_request_info *info,
                          union iwreq_data *wrqu, char *extra)