From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/net/wireless/Makefile | 3 +++ include/linux/Kbuild | 1 + net/core/rtnetlink.c | 19 ------------------- 3 files changed, 4 insertions(+), 19 deletions(-) diff -puN drivers/net/wireless/Makefile~git-wireless-fixup drivers/net/wireless/Makefile --- a/drivers/net/wireless/Makefile~git-wireless-fixup +++ a/drivers/net/wireless/Makefile @@ -44,3 +44,6 @@ obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs obj-$(CONFIG_USB_ZD1201) += zd1201.o obj-$(CONFIG_LIBERTAS_USB) += libertas/ + +# Drivers using Devicescape IEEE 802.11 stack (net/mac80211) +obj-y += mac80211/ diff -puN include/linux/Kbuild~git-wireless-fixup include/linux/Kbuild --- a/include/linux/Kbuild~git-wireless-fixup +++ a/include/linux/Kbuild @@ -69,6 +69,7 @@ header-y += hdsmart.h header-y += hysdn_if.h header-y += i2c-dev.h header-y += i8k.h +header-y += ieee80211.h header-y += icmp.h header-y += if_arcnet.h header-y += if_arp.h diff -puN net/core/rtnetlink.c~git-wireless-fixup net/core/rtnetlink.c --- a/net/core/rtnetlink.c~git-wireless-fixup +++ a/net/core/rtnetlink.c @@ -599,25 +599,6 @@ static int rtnl_getlink(struct sk_buff * } else return -EINVAL; -<<<<<<< HEAD/net/core/rtnetlink.c - -#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 */ - -======= ->>>>>>> /net/core/rtnetlink.c nskb = nlmsg_new(if_nlmsg_size(iw_buf_len), GFP_KERNEL); if (nskb == NULL) { err = -ENOBUFS; _