diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-04-27 05:42:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-04-27 05:42:51 +0200 |
| commit | 11433ee450eb4a320f46ce5ed51410b52803ffcc (patch) | |
| tree | 455f356778339e9015d445a020d60c0e0d095672 | |
| parent | [AFS]: Eliminate cmpxchg() usage in vlocation code. (diff) | |
| download | linux-11433ee450eb4a320f46ce5ed51410b52803ffcc.tar.xz linux-11433ee450eb4a320f46ce5ed51410b52803ffcc.zip | |
[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>
| -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 \ 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 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) } 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 3f082ffae387..3a96ae60271c 100644 --- 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 index fba295e05e7a..fba295e05e7a 100644 --- a/net/core/wireless.c +++ b/net/wireless/wext.c |