Commit 35b2a113 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d38069d1

Documentation/feature-removal-schedule.txt

+0 −9
Original line number Diff line number Diff line
@@ -249,15 +249,6 @@ Who: Ravikiran Thirumalai <kiran@scalex86.org> 


---------------------------



What:	Code that is now under CONFIG_WIRELESS_EXT_SYSFS

	(in net/core/net-sysfs.c)

When:	3.5

Why:	Over 1K .text/.data size reduction, data is available in other

	ways (ioctls)

Who:	Johannes Berg <johannes@sipsolutions.net>



---------------------------



What:	sysfs ui for changing p4-clockmod parameters

When:	September 2009

Why:	See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and

net/core/net-sysfs.c

+0 −74
Original line number Diff line number Diff line
@@ -417,72 +417,6 @@ static struct attribute_group netstat_group = { 
	.name  = "statistics",

	.attrs  = netstat_attrs,

};



#ifdef CONFIG_WIRELESS_EXT_SYSFS

/* helper function that does all the locking etc for wireless stats */

static ssize_t wireless_show(struct device *d, char *buf,

			     ssize_t (*format)(const struct iw_statistics *,

					       char *))

{

	struct net_device *dev = to_net_dev(d);

	const struct iw_statistics *iw;

	ssize_t ret = -EINVAL;



	if (!rtnl_trylock())

		return restart_syscall();

	if (dev_isalive(dev)) {

		iw = get_wireless_stats(dev);

		if (iw)

			ret = (*format)(iw, buf);

	}

	rtnl_unlock();



	return ret;

}



/* show function template for wireless fields */

#define WIRELESS_SHOW(name, field, format_string)			\

static ssize_t format_iw_##name(const struct iw_statistics *iw, char *buf) \

{									\

	return sprintf(buf, format_string, iw->field);			\

}									\

static ssize_t show_iw_##name(struct device *d,				\

			      struct device_attribute *attr, char *buf)	\

{									\

	return wireless_show(d, buf, format_iw_##name);			\

}									\

static DEVICE_ATTR(name, S_IRUGO, show_iw_##name, NULL)



WIRELESS_SHOW(status, status, fmt_hex);

WIRELESS_SHOW(link, qual.qual, fmt_dec);

WIRELESS_SHOW(level, qual.level, fmt_dec);

WIRELESS_SHOW(noise, qual.noise, fmt_dec);

WIRELESS_SHOW(nwid, discard.nwid, fmt_dec);

WIRELESS_SHOW(crypt, discard.code, fmt_dec);

WIRELESS_SHOW(fragment, discard.fragment, fmt_dec);

WIRELESS_SHOW(misc, discard.misc, fmt_dec);

WIRELESS_SHOW(retries, discard.retries, fmt_dec);

WIRELESS_SHOW(beacon, miss.beacon, fmt_dec);



static struct attribute *wireless_attrs[] = {

	&dev_attr_status.attr,

	&dev_attr_link.attr,

	&dev_attr_level.attr,

	&dev_attr_noise.attr,

	&dev_attr_nwid.attr,

	&dev_attr_crypt.attr,

	&dev_attr_fragment.attr,

	&dev_attr_retries.attr,

	&dev_attr_misc.attr,

	&dev_attr_beacon.attr,

	NULL

};



static struct attribute_group wireless_group = {

	.name = "wireless",

	.attrs = wireless_attrs,

};

#endif

#endif /* CONFIG_SYSFS */



#ifdef CONFIG_RPS
@@ -1463,14 +1397,6 @@ int netdev_register_kobject(struct net_device *net) 
		groups++;



	*groups++ = &netstat_group;

#ifdef CONFIG_WIRELESS_EXT_SYSFS

	if (net->ieee80211_ptr)

		*groups++ = &wireless_group;

#ifdef CONFIG_WIRELESS_EXT

	else if (net->wireless_handlers)

		*groups++ = &wireless_group;

#endif

#endif

#endif /* CONFIG_SYSFS */



	error = device_add(dev);

net/wireless/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -119,19 +119,6 @@ config CFG80211_WEXT 
	  Enable this option if you need old userspace for wireless

	  extensions with cfg80211-based drivers.



config WIRELESS_EXT_SYSFS

	bool "Wireless extensions sysfs files"

	depends on WEXT_CORE && SYSFS

	help

	  This option enables the deprecated wireless statistics

	  files in /sys/class/net/*/wireless/. The same information

	  is available via the ioctls as well.



	  Say N. If you know you have ancient tools requiring it,

	  like very old versions of hal (prior to 0.5.12 release),

	  say Y and update the tools as soon as possible as this

	  option will be removed soon.



config LIB80211

	tristate "Common routines for IEEE802.11 drivers"

	default n