[WEXT]: Move to net/wireless

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

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>

diff --git a/net/core/Makefile b/net/core/Makefile
index 73272d506e931d447d80d0033ca5999d0bb62f53..4751613e1b59a5c6cb75fbfe45648bd1f36a07ed 100644 (file)
--- a/net/core/Makefile
+++ b/net/core/Makefile
@@ -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

diff --git a/net/core/dev.c b/net/core/dev.c
index d82d00f5451f158d9c28aea69e3fe31a6f4b4637..700e4b5081b6ee6da6fe1f49b53bc57dfd0f8f63 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -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) &&

diff --git a/net/wireless/Makefile b/net/wireless/Makefile
index 3f082ffae387d25e5d4ae6f8c9983f804734b77c..3a96ae60271cf1d79641d6ef155b472cf7889e96 100644 (file)
--- a/net/wireless/Makefile
+++ b/net/wireless/Makefile
@@ -1,3 +1,4 @@
+obj-$(CONFIG_WIRELESS_EXT) += wext.o
 obj-$(CONFIG_CFG80211) += cfg80211.o
 
 cfg80211-y += core.o sysfs.o

diff --git a/net/core/wireless.c b/net/wireless/wext.c
similarity index 100%
rename from net/core/wireless.c
rename to net/wireless/wext.c