Skip to content

Commit

Permalink
[WIRELESS]: Remove wext over netlink.
Browse files Browse the repository at this point in the history
As scheduled, this patch removes the pointless wext over netlink code.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Johannes Berg authored and David S. Miller committed Apr 26, 2007
1 parent 704232c commit 9e101ea
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 798 deletions.
12 changes: 0 additions & 12 deletions Documentation/feature-removal-schedule.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions include/net/iw_handler.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
31 changes: 0 additions & 31 deletions net/core/rtnetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 9e101ea

Please sign in to comment.