aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-04-26 23:42:51 -0400
committerDavid S. Miller <davem@davemloft.net>2007-04-26 23:42:51 -0400
commit11433ee450eb4a320f46ce5ed51410b52803ffcc (patch)
tree455f356778339e9015d445a020d60c0e0d095672 /net
parent39bf09493042200b967cdf2ee6e3f670b7963903 (diff)
[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>
Diffstat (limited to 'net')
-rw-r--r--net/core/Makefile1
-rw-r--r--net/core/dev.c2
-rw-r--r--net/wireless/Makefile1
-rw-r--r--net/wireless/wext.c (renamed from net/core/wireless.c)0
4 files changed, 2 insertions, 2 deletions
diff --git a/net/core/Makefile b/net/core/Makefile
index 73272d506e93..4751613e1b59 100644
--- 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 \
13obj-$(CONFIG_XFRM) += flow.o 13obj-$(CONFIG_XFRM) += flow.o
14obj-$(CONFIG_SYSFS) += net-sysfs.o 14obj-$(CONFIG_SYSFS) += net-sysfs.o
15obj-$(CONFIG_NET_PKTGEN) += pktgen.o 15obj-$(CONFIG_NET_PKTGEN) += pktgen.o
16obj-$(CONFIG_WIRELESS_EXT) += wireless.o
17obj-$(CONFIG_NETPOLL) += netpoll.o 16obj-$(CONFIG_NETPOLL) += netpoll.o
18obj-$(CONFIG_NET_DMA) += user_dma.o 17obj-$(CONFIG_NET_DMA) += user_dma.o
19obj-$(CONFIG_FIB_RULES) += fib_rules.o 18obj-$(CONFIG_FIB_RULES) += fib_rules.o
diff --git a/net/core/dev.c b/net/core/dev.c
index d82d00f5451f..700e4b5081b6 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2936,7 +2936,7 @@ int dev_ioctl(unsigned int cmd, void __user *arg)
2936 } 2936 }
2937 dev_load(ifr.ifr_name); 2937 dev_load(ifr.ifr_name);
2938 rtnl_lock(); 2938 rtnl_lock();
2939 /* Follow me in net/core/wireless.c */ 2939 /* Follow me in net/wireless/wext.c */
2940 ret = wireless_process_ioctl(&ifr, cmd); 2940 ret = wireless_process_ioctl(&ifr, cmd);
2941 rtnl_unlock(); 2941 rtnl_unlock();
2942 if (IW_IS_GET(cmd) && 2942 if (IW_IS_GET(cmd) &&
diff --git a/net/wireless/Makefile b/net/wireless/Makefile
index 3f082ffae387..3a96ae60271c 100644
--- a/net/wireless/Makefile
+++ b/net/wireless/Makefile
@@ -1,3 +1,4 @@
1obj-$(CONFIG_WIRELESS_EXT) += wext.o
1obj-$(CONFIG_CFG80211) += cfg80211.o 2obj-$(CONFIG_CFG80211) += cfg80211.o
2 3
3cfg80211-y += core.o sysfs.o 4cfg80211-y += core.o sysfs.o
diff --git a/net/core/wireless.c b/net/wireless/wext.c
index fba295e05e7a..fba295e05e7a 100644
--- a/net/core/wireless.c
+++ b/net/wireless/wext.c