ipv6: fix an oops when force unload ipv6 module

[safe/jmp/linux-2.6] / net / wireless / ethtool.c

diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c
index 80d6d0d..ca4c825 100644 (file)
--- a/net/wireless/ethtool.c
+++ b/net/wireless/ethtool.c
@@ -12,13 +12,34 @@ static void cfg80211_get_drvinfo(struct net_device *dev,
 
        strlcpy(info->version, init_utsname()->release, sizeof(info->version));
 
-       strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
+       if (wdev->wiphy->fw_version[0])
+               strncpy(info->fw_version, wdev->wiphy->fw_version,
+                       sizeof(info->fw_version));
+       else
+               strncpy(info->fw_version, "N/A", sizeof(info->fw_version));
 
        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;
+}
+
 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,
 };