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

[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
...@@ -13,7 +13,6 @@ obj-y += dev.o ethtool.o dev_mcast.o dst.o netevent.o \ ...@@ -13,7 +13,6 @@ obj-y += dev.o ethtool.o dev_mcast.o dst.o netevent.o \
obj-$(CONFIG_XFRM) += flow.o obj-$(CONFIG_XFRM) += flow.o
obj-$(CONFIG_SYSFS) += net-sysfs.o obj-$(CONFIG_SYSFS) += net-sysfs.o
obj-$(CONFIG_NET_PKTGEN) += pktgen.o obj-$(CONFIG_NET_PKTGEN) += pktgen.o
obj-$(CONFIG_WIRELESS_EXT) += wireless.o
obj-$(CONFIG_NETPOLL) += netpoll.o obj-$(CONFIG_NETPOLL) += netpoll.o
obj-$(CONFIG_NET_DMA) += user_dma.o obj-$(CONFIG_NET_DMA) += user_dma.o
obj-$(CONFIG_FIB_RULES) += fib_rules.o obj-$(CONFIG_FIB_RULES) += fib_rules.o
...@@ -2936,7 +2936,7 @@ int dev_ioctl(unsigned int cmd, void __user *arg) ...@@ -2936,7 +2936,7 @@ int dev_ioctl(unsigned int cmd, void __user *arg)
} }
dev_load(ifr.ifr_name); dev_load(ifr.ifr_name);
rtnl_lock(); rtnl_lock();
/* Follow me in net/core/wireless.c */ /* Follow me in net/wireless/wext.c */
ret = wireless_process_ioctl(&ifr, cmd); ret = wireless_process_ioctl(&ifr, cmd);
rtnl_unlock(); rtnl_unlock();
if (IW_IS_GET(cmd) && if (IW_IS_GET(cmd) &&
......
obj-$(CONFIG_WIRELESS_EXT) += wext.o
obj-$(CONFIG_CFG80211) += cfg80211.o obj-$(CONFIG_CFG80211) += cfg80211.o
cfg80211-y += core.o sysfs.o cfg80211-y += core.o sysfs.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment