diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-09-08 16:04:05 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-09-25 16:52:14 -0400 |
commit | baef186519c69b11cf7e48c26e75feb1e6173baa (patch) | |
tree | a4a1ac70808443bec2f924e48b8a705050325cdf /net/core/net-sysfs.c | |
parent | 7c250413e5b7c3dfae89354725b70c76d7621395 (diff) | |
download | linux-stable-baef186519c69b11cf7e48c26e75feb1e6173baa.tar.gz linux-stable-baef186519c69b11cf7e48c26e75feb1e6173baa.tar.bz2 linux-stable-baef186519c69b11cf7e48c26e75feb1e6173baa.zip |
[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>
Diffstat (limited to 'net/core/net-sysfs.c')
-rw-r--r-- | net/core/net-sysfs.c | 5 |
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 |