Patched in Tegra support.

1 files changed, 5 insertions, 33 deletions

diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c
index 48c48ffafa1..9bde4d1d3e9 100644
--- a/net/wireless/ethtool.c
+++ b/net/wireless/ethtool.c
@@ -2,7 +2,6 @@
 #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)
@@ -48,8 +47,9 @@ static void cfg80211_get_ringparam(struct net_device *dev,
         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);
+                rdev->ops->get_ringparam(wdev->wiphy,
+                                         &rp->tx_pending, &rp->tx_max_pending,
+                                         &rp->rx_pending, &rp->rx_max_pending);
 }
 
 static int cfg80211_set_ringparam(struct net_device *dev,
@@ -62,37 +62,12 @@ static int cfg80211_set_ringparam(struct net_device *dev,
                 return -EINVAL;
 
         if (rdev->ops->set_ringparam)
-                return rdev_set_ringparam(rdev, rp->tx_pending, rp->rx_pending);
+                return rdev->ops->set_ringparam(wdev->wiphy,
+                                                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_dev(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_dev(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_dev(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,
@@ -100,7 +75,4 @@ const struct ethtool_ops cfg80211_ethtool_ops = {
         .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,
 };