wireless: implement basic ethtool support for cfg80211 devices

Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/wireless/Makefile b/net/wireless/Makefile
index c8141505a83af0686f3bbc156ac9e9e3a381eed9..f07c8dc7aab2990d543db566028fa1d460426e85 100644 (file)
--- a/net/wireless/Makefile
+++ b/net/wireless/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_WEXT_SPY) += wext-spy.o
 obj-$(CONFIG_WEXT_PRIV) += wext-priv.o
 
 cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o
-cfg80211-y += mlme.o ibss.o sme.o chan.o
+cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o
 cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o
 cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o
 

diff --git a/net/wireless/core.c b/net/wireless/core.c
index eb0bb24b99c39c3b12a29c380ff8cd8c1e875e8e..07252967be9ced2ee5b7dd6a5c003463b8b758df 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -21,6 +21,7 @@
 #include "sysfs.h"
 #include "debugfs.h"
 #include "wext-compat.h"
+#include "ethtool.h"
 
 /* name for sysfs, %d is appended */
 #define PHY_NAME "phy"
@@ -690,6 +691,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
                                wdev->wext.ps = false;
                        }
 #endif
+               if (!dev->ethtool_ops)
+                       dev->ethtool_ops = &cfg80211_ethtool_ops;
                break;
        case NETDEV_GOING_DOWN:
                switch (wdev->iftype) {

diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c
new file mode 100644 (file)
index 0000000..80d6d0d
--- /dev/null
+++ b/net/wireless/ethtool.c
@@ -0,0 +1,24 @@
+#include <linux/utsname.h>
+#include <net/cfg80211.h>
+#include "ethtool.h"
+
+static void cfg80211_get_drvinfo(struct net_device *dev,
+                                       struct ethtool_drvinfo *info)
+{
+       struct wireless_dev *wdev = dev->ieee80211_ptr;
+
+       strlcpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name,
+               sizeof(info->driver));
+
+       strlcpy(info->version, init_utsname()->release, sizeof(info->version));
+
+       strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
+
+       strlcpy(info->bus_info, dev_name(wiphy_dev(wdev->wiphy)),
+               sizeof(info->bus_info));
+}
+
+const struct ethtool_ops cfg80211_ethtool_ops = {
+       .get_drvinfo = cfg80211_get_drvinfo,
+       .get_link = ethtool_op_get_link,
+};

diff --git a/net/wireless/ethtool.h b/net/wireless/ethtool.h
new file mode 100644 (file)
index 0000000..70cbee1
--- /dev/null
+++ b/net/wireless/ethtool.h
@@ -0,0 +1,8 @@
+#ifndef __CFG80211_ETHTOOL__
+#define __CFG80211_ETHTOOL__
+
+#include <linux/ethtool.h>
+
+extern const struct ethtool_ops cfg80211_ethtool_ops;
+
+#endif /* __CFG80211_ETHTOOL__ */