Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e101eab authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[WIRELESS]: Remove wext over netlink. 



As scheduled, this patch removes the pointless wext over netlink code.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 704232c2

Documentation/feature-removal-schedule.txt

+0 −12
Original line number Diff line number Diff line
@@ -285,18 +285,6 @@ Who: Richard Purdie <rpurdie@rpsys.net> 


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



What:	Wireless extensions over netlink (CONFIG_NET_WIRELESS_RTNETLINK)

When:	with the merge of wireless-dev, 2.6.22 or later

Why:	The option/code is

	 * not enabled on most kernels

	 * not required by any userspace tools (except an experimental one,

	   and even there only for some parts, others use ioctl)

	 * pointless since wext is no longer evolving and the ioctl

	   interface needs to be kept

Who:	Johannes Berg <johannes@sipsolutions.net>



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



What:	i8xx_tco watchdog driver

When:	in 2.6.22

Why:	the i8xx_tco watchdog driver has been replaced by the iTCO_wdt

include/net/iw_handler.h

+0 −10
Original line number Diff line number Diff line
@@ -440,16 +440,6 @@ extern int dev_get_wireless_info(char * buffer, char **start, off_t offset, 
/* Handle IOCTLs, called in net/core/dev.c */

extern int wireless_process_ioctl(struct ifreq *ifr, unsigned int cmd);



/* Handle RtNetlink requests, called in net/core/rtnetlink.c */

extern int wireless_rtnetlink_set(struct net_device *	dev,

				  char *		data,

				  int			len);

extern int wireless_rtnetlink_get(struct net_device *	dev,

				  char *		data,

				  int			len,

				  char **		p_buf,

				  int *			p_len);



/* Second : functions that may be called by driver modules */



/* Send a single event to user space */

net/core/rtnetlink.c

+0 −31
Original line number Diff line number Diff line
@@ -51,10 +51,6 @@ 
#include <net/pkt_sched.h>

#include <net/fib_rules.h>

#include <net/rtnetlink.h>

#ifdef CONFIG_NET_WIRELESS_RTNETLINK

#include <linux/wireless.h>

#include <net/iw_handler.h>

#endif	/* CONFIG_NET_WIRELESS_RTNETLINK */



struct rtnl_link

{
@@ -684,17 +680,6 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) 
		modified = 1;

	}



#ifdef CONFIG_NET_WIRELESS_RTNETLINK

	if (tb[IFLA_WIRELESS]) {

		/* Call Wireless Extensions.

		 * Various stuff checked in there... */

		err = wireless_rtnetlink_set(dev, nla_data(tb[IFLA_WIRELESS]),

					     nla_len(tb[IFLA_WIRELESS]));

		if (err < 0)

			goto errout_dev;

	}

#endif	/* CONFIG_NET_WIRELESS_RTNETLINK */



	if (tb[IFLA_BROADCAST]) {

		nla_memcpy(dev->broadcast, tb[IFLA_BROADCAST], dev->addr_len);

		send_addr_notify = 1;
@@ -758,22 +743,6 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) 
	} else

		return -EINVAL;





#ifdef CONFIG_NET_WIRELESS_RTNETLINK

	if (tb[IFLA_WIRELESS]) {

		/* Call Wireless Extensions. We need to know the size before

		 * we can alloc. Various stuff checked in there... */

		err = wireless_rtnetlink_get(dev, nla_data(tb[IFLA_WIRELESS]),

					     nla_len(tb[IFLA_WIRELESS]),

					     &iw_buf, &iw_buf_len);

		if (err < 0)

			goto errout;



		/* Payload is at an offset in buffer */

		iw = iw_buf + IW_EV_POINT_OFF;

	}

#endif	/* CONFIG_NET_WIRELESS_RTNETLINK */



	nskb = nlmsg_new(if_nlmsg_size(iw_buf_len), GFP_KERNEL);

	if (nskb == NULL) {

		err = -ENOBUFS;