diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/core/Makefile | 1 | ||||
-rw-r--r-- | net/core/dev.c | 2 | ||||
-rw-r--r-- | net/wireless/Makefile | 1 | ||||
-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 \ | |||
13 | obj-$(CONFIG_XFRM) += flow.o | 13 | obj-$(CONFIG_XFRM) += flow.o |
14 | obj-$(CONFIG_SYSFS) += net-sysfs.o | 14 | obj-$(CONFIG_SYSFS) += net-sysfs.o |
15 | obj-$(CONFIG_NET_PKTGEN) += pktgen.o | 15 | obj-$(CONFIG_NET_PKTGEN) += pktgen.o |
16 | obj-$(CONFIG_WIRELESS_EXT) += wireless.o | ||
17 | obj-$(CONFIG_NETPOLL) += netpoll.o | 16 | obj-$(CONFIG_NETPOLL) += netpoll.o |
18 | obj-$(CONFIG_NET_DMA) += user_dma.o | 17 | obj-$(CONFIG_NET_DMA) += user_dma.o |
19 | obj-$(CONFIG_FIB_RULES) += fib_rules.o | 18 | obj-$(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 @@ | |||
1 | obj-$(CONFIG_WIRELESS_EXT) += wext.o | ||
1 | obj-$(CONFIG_CFG80211) += cfg80211.o | 2 | obj-$(CONFIG_CFG80211) += cfg80211.o |
2 | 3 | ||
3 | cfg80211-y += core.o sysfs.o | 4 | cfg80211-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 | |||