Commit 35b2a113cb0298d4f9a1263338b456094a414057
Committed by
John W. Linville
John W. Linville
1 parent
d38069d1e3
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
wireless: remove wext sysfs
The only user of this was hal prior to its 0.5.12 release which happened over two years ago, so I'm sure this can be removed without issues. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Showing 3 changed files with 0 additions and 96 deletions Side-by-side Diff
Documentation/feature-removal-schedule.txt
| ... | ... | @@ -249,15 +249,6 @@ |
| 249 | 249 | |
| 250 | 250 | --------------------------- |
| 251 | 251 | |
| 252 | -What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS | |
| 253 | - (in net/core/net-sysfs.c) | |
| 254 | -When: 3.5 | |
| 255 | -Why: Over 1K .text/.data size reduction, data is available in other | |
| 256 | - ways (ioctls) | |
| 257 | -Who: Johannes Berg <johannes@sipsolutions.net> | |
| 258 | - | |
| 259 | ---------------------------- | |
| 260 | - | |
| 261 | 252 | What: sysfs ui for changing p4-clockmod parameters |
| 262 | 253 | When: September 2009 |
| 263 | 254 | Why: See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and |
net/core/net-sysfs.c
| ... | ... | @@ -417,72 +417,6 @@ |
| 417 | 417 | .name = "statistics", |
| 418 | 418 | .attrs = netstat_attrs, |
| 419 | 419 | }; |
| 420 | - | |
| 421 | -#ifdef CONFIG_WIRELESS_EXT_SYSFS | |
| 422 | -/* helper function that does all the locking etc for wireless stats */ | |
| 423 | -static ssize_t wireless_show(struct device *d, char *buf, | |
| 424 | - ssize_t (*format)(const struct iw_statistics *, | |
| 425 | - char *)) | |
| 426 | -{ | |
| 427 | - struct net_device *dev = to_net_dev(d); | |
| 428 | - const struct iw_statistics *iw; | |
| 429 | - ssize_t ret = -EINVAL; | |
| 430 | - | |
| 431 | - if (!rtnl_trylock()) | |
| 432 | - return restart_syscall(); | |
| 433 | - if (dev_isalive(dev)) { | |
| 434 | - iw = get_wireless_stats(dev); | |
| 435 | - if (iw) | |
| 436 | - ret = (*format)(iw, buf); | |
| 437 | - } | |
| 438 | - rtnl_unlock(); | |
| 439 | - | |
| 440 | - return ret; | |
| 441 | -} | |
| 442 | - | |
| 443 | -/* show function template for wireless fields */ | |
| 444 | -#define WIRELESS_SHOW(name, field, format_string) \ | |
| 445 | -static ssize_t format_iw_##name(const struct iw_statistics *iw, char *buf) \ | |
| 446 | -{ \ | |
| 447 | - return sprintf(buf, format_string, iw->field); \ | |
| 448 | -} \ | |
| 449 | -static ssize_t show_iw_##name(struct device *d, \ | |
| 450 | - struct device_attribute *attr, char *buf) \ | |
| 451 | -{ \ | |
| 452 | - return wireless_show(d, buf, format_iw_##name); \ | |
| 453 | -} \ | |
| 454 | -static DEVICE_ATTR(name, S_IRUGO, show_iw_##name, NULL) | |
| 455 | - | |
| 456 | -WIRELESS_SHOW(status, status, fmt_hex); | |
| 457 | -WIRELESS_SHOW(link, qual.qual, fmt_dec); | |
| 458 | -WIRELESS_SHOW(level, qual.level, fmt_dec); | |
| 459 | -WIRELESS_SHOW(noise, qual.noise, fmt_dec); | |
| 460 | -WIRELESS_SHOW(nwid, discard.nwid, fmt_dec); | |
| 461 | -WIRELESS_SHOW(crypt, discard.code, fmt_dec); | |
| 462 | -WIRELESS_SHOW(fragment, discard.fragment, fmt_dec); | |
| 463 | -WIRELESS_SHOW(misc, discard.misc, fmt_dec); | |
| 464 | -WIRELESS_SHOW(retries, discard.retries, fmt_dec); | |
| 465 | -WIRELESS_SHOW(beacon, miss.beacon, fmt_dec); | |
| 466 | - | |
| 467 | -static struct attribute *wireless_attrs[] = { | |
| 468 | - &dev_attr_status.attr, | |
| 469 | - &dev_attr_link.attr, | |
| 470 | - &dev_attr_level.attr, | |
| 471 | - &dev_attr_noise.attr, | |
| 472 | - &dev_attr_nwid.attr, | |
| 473 | - &dev_attr_crypt.attr, | |
| 474 | - &dev_attr_fragment.attr, | |
| 475 | - &dev_attr_retries.attr, | |
| 476 | - &dev_attr_misc.attr, | |
| 477 | - &dev_attr_beacon.attr, | |
| 478 | - NULL | |
| 479 | -}; | |
| 480 | - | |
| 481 | -static struct attribute_group wireless_group = { | |
| 482 | - .name = "wireless", | |
| 483 | - .attrs = wireless_attrs, | |
| 484 | -}; | |
| 485 | -#endif | |
| 486 | 420 | #endif /* CONFIG_SYSFS */ |
| 487 | 421 | |
| 488 | 422 | #ifdef CONFIG_RPS |
| ... | ... | @@ -1463,14 +1397,6 @@ |
| 1463 | 1397 | groups++; |
| 1464 | 1398 | |
| 1465 | 1399 | *groups++ = &netstat_group; |
| 1466 | -#ifdef CONFIG_WIRELESS_EXT_SYSFS | |
| 1467 | - if (net->ieee80211_ptr) | |
| 1468 | - *groups++ = &wireless_group; | |
| 1469 | -#ifdef CONFIG_WIRELESS_EXT | |
| 1470 | - else if (net->wireless_handlers) | |
| 1471 | - *groups++ = &wireless_group; | |
| 1472 | -#endif | |
| 1473 | -#endif | |
| 1474 | 1400 | #endif /* CONFIG_SYSFS */ |
| 1475 | 1401 | |
| 1476 | 1402 | error = device_add(dev); |
net/wireless/Kconfig
| ... | ... | @@ -119,19 +119,6 @@ |
| 119 | 119 | Enable this option if you need old userspace for wireless |
| 120 | 120 | extensions with cfg80211-based drivers. |
| 121 | 121 | |
| 122 | -config WIRELESS_EXT_SYSFS | |
| 123 | - bool "Wireless extensions sysfs files" | |
| 124 | - depends on WEXT_CORE && SYSFS | |
| 125 | - help | |
| 126 | - This option enables the deprecated wireless statistics | |
| 127 | - files in /sys/class/net/*/wireless/. The same information | |
| 128 | - is available via the ioctls as well. | |
| 129 | - | |
| 130 | - Say N. If you know you have ancient tools requiring it, | |
| 131 | - like very old versions of hal (prior to 0.5.12 release), | |
| 132 | - say Y and update the tools as soon as possible as this | |
| 133 | - option will be removed soon. | |
| 134 | - | |
| 135 | 122 | config LIB80211 |
| 136 | 123 | tristate "Common routines for IEEE802.11 drivers" |
| 137 | 124 | default n |