diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-04-23 12:19:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:29:40 -0700 |
| commit | 2a5e1c0eb9efe26eed1dd072fe08de5797a7efd5 (patch) | |
| tree | 1afe58737da901f6610e38c5a0db889d098f6e2a /net | |
| parent | 724c6b35ecff0fb68bbb315a34b2f9cb694865d3 (diff) | |
[WIRELESS]: Refactor wireless Kconfig.
This patch refactors the wireless Kconfig all over and already
introduces net/wireless/Kconfig with just the WEXT bit for now,
the cfg80211 patch will add to that as well.
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/Kconfig | 11 | ||||
| -rw-r--r-- | net/Makefile | 2 | ||||
| -rw-r--r-- | net/ieee80211/Kconfig | 3 | ||||
| -rw-r--r-- | net/wireless/Kconfig | 23 | ||||
| -rw-r--r-- | net/wireless/Makefile | 1 |
5 files changed, 35 insertions, 5 deletions
diff --git a/net/Kconfig b/net/Kconfig index e2d9b3b9cda..ae1817dc51b 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -212,14 +212,17 @@ endmenu source "net/ax25/Kconfig" source "net/irda/Kconfig" source "net/bluetooth/Kconfig" -source "net/ieee80211/Kconfig" - -config WIRELESS_EXT - bool config FIB_RULES bool +menu "Wireless" + +source "net/wireless/Kconfig" +source "net/ieee80211/Kconfig" + +endmenu + endif # if NET endmenu # Networking diff --git a/net/Makefile b/net/Makefile index 4854ac50631..29bbe19d87f 100644 --- a/net/Makefile +++ b/net/Makefile @@ -52,3 +52,5 @@ obj-$(CONFIG_IUCV) += iucv/ ifeq ($(CONFIG_NET),y) obj-$(CONFIG_SYSCTL) += sysctl_net.o endif + +obj-y += wireless/ diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig index 6ef766ef961..1438adedbc8 100644 --- a/net/ieee80211/Kconfig +++ b/net/ieee80211/Kconfig @@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP config IEEE80211_CRYPT_TKIP tristate "IEEE 802.11i TKIP encryption" - depends on IEEE80211 && NET_RADIO + depends on IEEE80211 + select WIRELESS_EXT select CRYPTO select CRYPTO_MICHAEL_MIC select CRYPTO_ECB diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig new file mode 100644 index 00000000000..ca2f05c2976 --- /dev/null +++ b/net/wireless/Kconfig @@ -0,0 +1,23 @@ +config WIRELESS_EXT + bool "Wireless extensions" + default n + ---help--- + This option enables the legacy wireless extensions + (wireless network interface configuration via ioctls.) + + Wireless extensions will be replaced by cfg80211 and + will be required only by legacy drivers that implement + wireless extension handlers. + + Say N (if you can) unless you know you need wireless + extensions for external modules. + +config NET_WIRELESS_RTNETLINK + bool "Wireless Extension API over RtNetlink" + depends on WIRELESS_EXT + ---help--- + Support the Wireless Extension API over the RtNetlink socket + in addition to the traditional ioctl interface (selected above). + + For now, few tools use this facility, but it might grow in the + future. The only downside is that it adds 4.5 kB to your kernel. diff --git a/net/wireless/Makefile b/net/wireless/Makefile new file mode 100644 index 00000000000..cf4e3d9726b --- /dev/null +++ b/net/wireless/Makefile @@ -0,0 +1 @@ +# dummy file for now |