Commit beb2a7f3 authored by John W. Linville's avatar John W. Linville

net/ieee80211 -> drivers/net/ipw2x00/libipw_* rename

The old ieee80211 code only remains as a support library for the ipw2100
and ipw2200 drivers.  So, move the code and rename it appropriately to
reflects it's true purpose and status.
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0795cd29
...@@ -8,7 +8,7 @@ config IPW2100 ...@@ -8,7 +8,7 @@ config IPW2100
select WIRELESS_EXT select WIRELESS_EXT
select FW_LOADER select FW_LOADER
select LIB80211 select LIB80211
select IEEE80211 select LIBIPW
---help--- ---help---
A driver for the Intel PRO/Wireless 2100 Network A driver for the Intel PRO/Wireless 2100 Network
Connection 802.11b wireless network adapter. Connection 802.11b wireless network adapter.
...@@ -67,7 +67,7 @@ config IPW2200 ...@@ -67,7 +67,7 @@ config IPW2200
select WIRELESS_EXT select WIRELESS_EXT
select FW_LOADER select FW_LOADER
select LIB80211 select LIB80211
select IEEE80211 select LIBIPW
---help--- ---help---
A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
Connection adapters. Connection adapters.
...@@ -148,3 +148,44 @@ config IPW2200_DEBUG ...@@ -148,3 +148,44 @@ config IPW2200_DEBUG
If you are not sure, say N here. If you are not sure, say N here.
config LIBIPW
tristate
select WIRELESS_EXT
select CRYPTO
select CRYPTO_ARC4
select CRYPTO_ECB
select CRYPTO_AES
select CRYPTO_MICHAEL_MIC
select CRYPTO_ECB
select CRC32
select LIB80211
select LIB80211_CRYPT_WEP
select LIB80211_CRYPT_TKIP
select LIB80211_CRYPT_CCMP
---help---
This option enables the hardware independent IEEE 802.11
networking stack. This component is deprecated in favor of the
mac80211 component.
config LIBIPW_DEBUG
bool "Full debugging output for the LIBIPW component"
depends on LIBIPW
---help---
This option will enable debug tracing output for the
libipw component.
This will result in the kernel module being ~70k larger. You
can control which debug output is sent to the kernel log by
setting the value in
/proc/net/ieee80211/debug_level
For example:
% echo 0x00000FFO > /proc/net/ieee80211/debug_level
For a list of values you can assign to debug_level, you
can look at the bit mask values in <net/ieee80211.h>
If you are not trying to debug or develop the libipw
component, you most likely want to say N here.
...@@ -4,3 +4,11 @@ ...@@ -4,3 +4,11 @@
obj-$(CONFIG_IPW2100) += ipw2100.o obj-$(CONFIG_IPW2100) += ipw2100.o
obj-$(CONFIG_IPW2200) += ipw2200.o obj-$(CONFIG_IPW2200) += ipw2200.o
obj-$(CONFIG_LIBIPW) += libipw.o
libipw-objs := \
libipw_module.o \
libipw_tx.o \
libipw_rx.o \
libipw_wx.o \
libipw_geo.o
...@@ -251,7 +251,6 @@ if WIRELESS ...@@ -251,7 +251,6 @@ if WIRELESS
source "net/wireless/Kconfig" source "net/wireless/Kconfig"
source "net/mac80211/Kconfig" source "net/mac80211/Kconfig"
source "net/ieee80211/Kconfig"
endif # WIRELESS endif # WIRELESS
......
...@@ -51,7 +51,6 @@ obj-$(CONFIG_IP_DCCP) += dccp/ ...@@ -51,7 +51,6 @@ obj-$(CONFIG_IP_DCCP) += dccp/
obj-$(CONFIG_IP_SCTP) += sctp/ obj-$(CONFIG_IP_SCTP) += sctp/
obj-y += wireless/ obj-y += wireless/
obj-$(CONFIG_MAC80211) += mac80211/ obj-$(CONFIG_MAC80211) += mac80211/
obj-$(CONFIG_IEEE80211) += ieee80211/
obj-$(CONFIG_TIPC) += tipc/ obj-$(CONFIG_TIPC) += tipc/
obj-$(CONFIG_NETLABEL) += netlabel/ obj-$(CONFIG_NETLABEL) += netlabel/
obj-$(CONFIG_IUCV) += iucv/ obj-$(CONFIG_IUCV) += iucv/
......
config IEEE80211
tristate
select WIRELESS_EXT
select CRYPTO
select CRYPTO_ARC4
select CRYPTO_ECB
select CRYPTO_AES
select CRYPTO_MICHAEL_MIC
select CRYPTO_ECB
select CRC32
select LIB80211
select LIB80211_CRYPT_WEP
select LIB80211_CRYPT_TKIP
select LIB80211_CRYPT_CCMP
---help---
This option enables the hardware independent IEEE 802.11
networking stack. This component is deprecated in favor of the
mac80211 component.
config IEEE80211_DEBUG
bool "Full debugging output for the old IEEE80211 stack"
depends on IEEE80211
---help---
This option will enable debug tracing output for the
ieee80211 network stack.
This will result in the kernel module being ~70k larger. You
can control which debug output is sent to the kernel log by
setting the value in
/proc/net/ieee80211/debug_level
For example:
% echo 0x00000FFO > /proc/net/ieee80211/debug_level
For a list of values you can assign to debug_level, you
can look at the bit mask values in <net/ieee80211.h>
If you are not trying to debug or develop the ieee80211
subsystem, you most likely want to say N here.
obj-$(CONFIG_IEEE80211) += ieee80211.o
ieee80211-objs := \
ieee80211_module.o \
ieee80211_tx.o \
ieee80211_rx.o \
ieee80211_wx.o \
ieee80211_geo.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment