diff options
Diffstat (limited to 'net/core/rtnetlink.c')
-rw-r--r-- | net/core/rtnetlink.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 75cea8ea4cf3..4fe0f4b3a345 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
@@ -51,10 +51,6 @@ | |||
51 | #include <net/pkt_sched.h> | 51 | #include <net/pkt_sched.h> |
52 | #include <net/fib_rules.h> | 52 | #include <net/fib_rules.h> |
53 | #include <net/rtnetlink.h> | 53 | #include <net/rtnetlink.h> |
54 | #ifdef CONFIG_NET_WIRELESS_RTNETLINK | ||
55 | #include <linux/wireless.h> | ||
56 | #include <net/iw_handler.h> | ||
57 | #endif /* CONFIG_NET_WIRELESS_RTNETLINK */ | ||
58 | 54 | ||
59 | struct rtnl_link | 55 | struct rtnl_link |
60 | { | 56 | { |
@@ -684,17 +680,6 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | |||
684 | modified = 1; | 680 | modified = 1; |
685 | } | 681 | } |
686 | 682 | ||
687 | #ifdef CONFIG_NET_WIRELESS_RTNETLINK | ||
688 | if (tb[IFLA_WIRELESS]) { | ||
689 | /* Call Wireless Extensions. | ||
690 | * Various stuff checked in there... */ | ||
691 | err = wireless_rtnetlink_set(dev, nla_data(tb[IFLA_WIRELESS]), | ||
692 | nla_len(tb[IFLA_WIRELESS])); | ||
693 | if (err < 0) | ||
694 | goto errout_dev; | ||
695 | } | ||
696 | #endif /* CONFIG_NET_WIRELESS_RTNETLINK */ | ||
697 | |||
698 | if (tb[IFLA_BROADCAST]) { | 683 | if (tb[IFLA_BROADCAST]) { |
699 | nla_memcpy(dev->broadcast, tb[IFLA_BROADCAST], dev->addr_len); | 684 | nla_memcpy(dev->broadcast, tb[IFLA_BROADCAST], dev->addr_len); |
700 | send_addr_notify = 1; | 685 | send_addr_notify = 1; |
@@ -758,22 +743,6 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) | |||
758 | } else | 743 | } else |
759 | return -EINVAL; | 744 | return -EINVAL; |
760 | 745 | ||
761 | |||
762 | #ifdef CONFIG_NET_WIRELESS_RTNETLINK | ||
763 | if (tb[IFLA_WIRELESS]) { | ||
764 | /* Call Wireless Extensions. We need to know the size before | ||
765 | * we can alloc. Various stuff checked in there... */ | ||
766 | err = wireless_rtnetlink_get(dev, nla_data(tb[IFLA_WIRELESS]), | ||
767 | nla_len(tb[IFLA_WIRELESS]), | ||
768 | &iw_buf, &iw_buf_len); | ||
769 | if (err < 0) | ||
770 | goto errout; | ||
771 | |||
772 | /* Payload is at an offset in buffer */ | ||
773 | iw = iw_buf + IW_EV_POINT_OFF; | ||
774 | } | ||
775 | #endif /* CONFIG_NET_WIRELESS_RTNETLINK */ | ||
776 | |||
777 | nskb = nlmsg_new(if_nlmsg_size(iw_buf_len), GFP_KERNEL); | 746 | nskb = nlmsg_new(if_nlmsg_size(iw_buf_len), GFP_KERNEL); |
778 | if (nskb == NULL) { | 747 | if (nskb == NULL) { |
779 | err = -ENOBUFS; | 748 | err = -ENOBUFS; |