[PATCH] WE-21 support (core API)

This is version 21 of the Wireless Extensions. Changelog :
	o finishes migrating the ESSID API (remove the +1)
	o netdev->get_wireless_stats is no more
	o long/short retry

This is a redacted version of a patch originally submitted by Jean
Tourrilhes.  I removed most of the additions, in order to minimize
future support requirements for nl80211 (or other WE successor).

CC: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 1 insertions, 4 deletions

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 13472762b18b..f47f319bb7dc 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -344,8 +344,6 @@ static ssize_t wireless_show(struct class_device *cd, char *buf,
                 if(dev->wireless_handlers &&
                    dev->wireless_handlers->get_wireless_stats)
                         iw = dev->wireless_handlers->get_wireless_stats(dev);
-                else if (dev->get_wireless_stats)
-                        iw = dev->get_wireless_stats(dev);
                 if (iw != NULL)
                         ret = (*format)(iw, buf);
         }
@@ -465,8 +463,7 @@ int netdev_register_sysfs(struct net_device *net)
                 *groups++ = &netstat_group;
 
 #ifdef WIRELESS_EXT
-        if (net->get_wireless_stats
-            || (net->wireless_handlers && net->wireless_handlers->get_wireless_stats))
+        if (net->wireless_handlers && net->wireless_handlers->get_wireless_stats)
                 *groups++ = &wireless_group;
 #endif