aboutsummaryrefslogtreecommitdiffstats
path: root/net/ieee80211
diff options
context:
space:
mode:
Diffstat (limited to 'net/ieee80211')
-rw-r--r--net/ieee80211/Kconfig26
-rw-r--r--net/ieee80211/Makefile2
2 files changed, 14 insertions, 14 deletions
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index 961c711eda97..58ed4319e693 100644
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -2,19 +2,19 @@ config IEEE80211
2 tristate "Generic IEEE 802.11 Networking Stack" 2 tristate "Generic IEEE 802.11 Networking Stack"
3 select NET_RADIO 3 select NET_RADIO
4 ---help--- 4 ---help---
5 This option enables the hardware independent IEEE 802.11 5 This option enables the hardware independent IEEE 802.11
6 networking stack. 6 networking stack.
7 7
8config IEEE80211_DEBUG 8config IEEE80211_DEBUG
9 bool "Enable full debugging output" 9 bool "Enable full debugging output"
10 depends on IEEE80211 10 depends on IEEE80211
11 ---help--- 11 ---help---
12 This option will enable debug tracing output for the 12 This option will enable debug tracing output for the
13 ieee80211 network stack. 13 ieee80211 network stack.
14 14
15 This will result in the kernel module being ~70k larger. You 15 This will result in the kernel module being ~70k larger. You
16 can control which debug output is sent to the kernel log by 16 can control which debug output is sent to the kernel log by
17 setting the value in 17 setting the value in
18 18
19 /proc/net/ieee80211/debug_level 19 /proc/net/ieee80211/debug_level
20 20
@@ -22,10 +22,10 @@ config IEEE80211_DEBUG
22 22
23 % echo 0x00000FFO > /proc/net/ieee80211/debug_level 23 % echo 0x00000FFO > /proc/net/ieee80211/debug_level
24 24
25 For a list of values you can assign to debug_level, you 25 For a list of values you can assign to debug_level, you
26 can look at the bit mask values in <net/ieee80211.h> 26 can look at the bit mask values in <net/ieee80211.h>
27 27
28 If you are not trying to debug or develop the ieee80211 28 If you are not trying to debug or develop the ieee80211
29 subsystem, you most likely want to say N here. 29 subsystem, you most likely want to say N here.
30 30
31config IEEE80211_CRYPT_WEP 31config IEEE80211_CRYPT_WEP
@@ -35,7 +35,7 @@ config IEEE80211_CRYPT_WEP
35 select CRYPTO_ARC4 35 select CRYPTO_ARC4
36 select CRC32 36 select CRC32
37 ---help--- 37 ---help---
38 Include software based cipher suites in support of IEEE 38 Include software based cipher suites in support of IEEE
39 802.11's WEP. This is needed for WEP as well as 802.1x. 39 802.11's WEP. This is needed for WEP as well as 802.1x.
40 40
41 This can be compiled as a modules and it will be called 41 This can be compiled as a modules and it will be called
@@ -47,8 +47,8 @@ config IEEE80211_CRYPT_CCMP
47 select CRYPTO 47 select CRYPTO
48 select CRYPTO_AES 48 select CRYPTO_AES
49 ---help--- 49 ---help---
50 Include software based cipher suites in support of IEEE 802.11i 50 Include software based cipher suites in support of IEEE 802.11i
51 (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with CCMP enabled 51 (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with CCMP enabled
52 networks. 52 networks.
53 53
54 This can be compiled as a modules and it will be called 54 This can be compiled as a modules and it will be called
@@ -60,8 +60,8 @@ config IEEE80211_CRYPT_TKIP
60 select CRYPTO 60 select CRYPTO
61 select CRYPTO_MICHAEL_MIC 61 select CRYPTO_MICHAEL_MIC
62 ---help--- 62 ---help---
63 Include software based cipher suites in support of IEEE 802.11i 63 Include software based cipher suites in support of IEEE 802.11i
64 (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled 64 (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled
65 networks. 65 networks.
66 66
67 This can be compiled as a modules and it will be called 67 This can be compiled as a modules and it will be called
diff --git a/net/ieee80211/Makefile b/net/ieee80211/Makefile
index 29be9cae1def..a6ccac5baea8 100644
--- a/net/ieee80211/Makefile
+++ b/net/ieee80211/Makefile
@@ -1,4 +1,4 @@
1obj-$(CONFIG_IEEE80211) += ieee80211.o 1obj-$(CONFIG_IEEE80211) += ieee80211.o
2obj-$(CONFIG_IEEE80211) += ieee80211_crypt.o 2obj-$(CONFIG_IEEE80211) += ieee80211_crypt.o
3obj-$(CONFIG_IEEE80211_CRYPT_WEP) += ieee80211_crypt_wep.o 3obj-$(CONFIG_IEEE80211_CRYPT_WEP) += ieee80211_crypt_wep.o
4obj-$(CONFIG_IEEE80211_CRYPT_CCMP) += ieee80211_crypt_ccmp.o 4obj-$(CONFIG_IEEE80211_CRYPT_CCMP) += ieee80211_crypt_ccmp.o