Merge l2-mtd/next into l2-mtd/master

[cascardo/linux.git] / net / wireless / ethtool.c

diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c
index d4860bf..e9e9129 100644 (file)
--- a/net/wireless/ethtool.c
+++ b/net/wireless/ethtool.c
@@ -1,11 +1,9 @@
 #include <linux/utsname.h>
 #include <net/cfg80211.h>
 #include "core.h"
-#include "ethtool.h"
 #include "rdev-ops.h"
 
-static void cfg80211_get_drvinfo(struct net_device *dev,
-                                       struct ethtool_drvinfo *info)
+void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
 
@@ -23,84 +21,4 @@ static void cfg80211_get_drvinfo(struct net_device *dev,
        strlcpy(info->bus_info, dev_name(wiphy_dev(wdev->wiphy)),
                sizeof(info->bus_info));
 }
-
-static int cfg80211_get_regs_len(struct net_device *dev)
-{
-       /* For now, return 0... */
-       return 0;
-}
-
-static void cfg80211_get_regs(struct net_device *dev, struct ethtool_regs *regs,
-                       void *data)
-{
-       struct wireless_dev *wdev = dev->ieee80211_ptr;
-
-       regs->version = wdev->wiphy->hw_version;
-       regs->len = 0;
-}
-
-static void cfg80211_get_ringparam(struct net_device *dev,
-                                  struct ethtool_ringparam *rp)
-{
-       struct wireless_dev *wdev = dev->ieee80211_ptr;
-       struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
-
-       memset(rp, 0, sizeof(*rp));
-
-       if (rdev->ops->get_ringparam)
-               rdev_get_ringparam(rdev, &rp->tx_pending, &rp->tx_max_pending,
-                                  &rp->rx_pending, &rp->rx_max_pending);
-}
-
-static int cfg80211_set_ringparam(struct net_device *dev,
-                                 struct ethtool_ringparam *rp)
-{
-       struct wireless_dev *wdev = dev->ieee80211_ptr;
-       struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
-
-       if (rp->rx_mini_pending != 0 || rp->rx_jumbo_pending != 0)
-               return -EINVAL;
-
-       if (rdev->ops->set_ringparam)
-               return rdev_set_ringparam(rdev, rp->tx_pending, rp->rx_pending);
-
-       return -ENOTSUPP;
-}
-
-static int cfg80211_get_sset_count(struct net_device *dev, int sset)
-{
-       struct wireless_dev *wdev = dev->ieee80211_ptr;
-       struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
-       if (rdev->ops->get_et_sset_count)
-               return rdev_get_et_sset_count(rdev, dev, sset);
-       return -EOPNOTSUPP;
-}
-
-static void cfg80211_get_stats(struct net_device *dev,
-                              struct ethtool_stats *stats, u64 *data)
-{
-       struct wireless_dev *wdev = dev->ieee80211_ptr;
-       struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
-       if (rdev->ops->get_et_stats)
-               rdev_get_et_stats(rdev, dev, stats, data);
-}
-
-static void cfg80211_get_strings(struct net_device *dev, u32 sset, u8 *data)
-{
-       struct wireless_dev *wdev = dev->ieee80211_ptr;
-       struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
-       if (rdev->ops->get_et_strings)
-               rdev_get_et_strings(rdev, dev, sset, data);
-}
-
-const struct ethtool_ops cfg80211_ethtool_ops = {
-       .get_drvinfo = cfg80211_get_drvinfo,
-       .get_regs_len = cfg80211_get_regs_len,
-       .get_regs = cfg80211_get_regs,
-       .get_link = ethtool_op_get_link,
-       .get_ringparam = cfg80211_get_ringparam,
-       .set_ringparam = cfg80211_set_ringparam,
-       .get_strings = cfg80211_get_strings,
-       .get_ethtool_stats = cfg80211_get_stats,
-       .get_sset_count = cfg80211_get_sset_count,
-};
+EXPORT_SYMBOL(cfg80211_get_drvinfo);