Commit 11433ee4 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[WEXT]: Move to net/wireless 



This patch moves dev/core/wireless.c to net/wireless/wext.c.

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 39bf0949

net/core/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ obj-y += dev.o ethtool.o dev_mcast.o dst.o netevent.o \ 
obj-$(CONFIG_XFRM) += flow.o

obj-$(CONFIG_SYSFS) += net-sysfs.o

obj-$(CONFIG_NET_PKTGEN) += pktgen.o

obj-$(CONFIG_WIRELESS_EXT) += wireless.o

obj-$(CONFIG_NETPOLL) += netpoll.o

obj-$(CONFIG_NET_DMA) += user_dma.o

obj-$(CONFIG_FIB_RULES) += fib_rules.o

net/core/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -2936,7 +2936,7 @@ int dev_ioctl(unsigned int cmd, void __user *arg) 
				}

				dev_load(ifr.ifr_name);

				rtnl_lock();

				/* Follow me in net/core/wireless.c */

				/* Follow me in net/wireless/wext.c */

				ret = wireless_process_ioctl(&ifr, cmd);

				rtnl_unlock();

				if (IW_IS_GET(cmd) &&

net/wireless/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_WIRELESS_EXT) += wext.o

obj-$(CONFIG_CFG80211) += cfg80211.o



cfg80211-y += core.o sysfs.o

net/core/wireless.c→net/wireless/wext.c

+0 −0

File moved.

View file