11 files changed, 51 insertions, 53 deletions

diff --git a/drivers/net/wireless/ipw2x00/Kconfig b/drivers/net/wireless/ipw2x00/Kconfig
index 67c57bfa5c1a..3d5cc4463d4d 100644
--- a/drivers/net/wireless/ipw2x00/Kconfig
+++ b/drivers/net/wireless/ipw2x00/Kconfig
@@ -8,7 +8,7 @@ config IPW2100
         select WIRELESS_EXT
         select FW_LOADER
         select LIB80211
-        select IEEE80211
+        select LIBIPW
         ---help---
           A driver for the Intel PRO/Wireless 2100 Network 
           Connection 802.11b wireless network adapter.
@@ -67,7 +67,7 @@ config IPW2200
         select WIRELESS_EXT
         select FW_LOADER
         select LIB80211
-        select IEEE80211
+        select LIBIPW
         ---help---
           A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
           Connection adapters. 
@@ -148,3 +148,44 @@ config IPW2200_DEBUG
 
           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.
diff --git a/drivers/net/wireless/ipw2x00/Makefile b/drivers/net/wireless/ipw2x00/Makefile
index dbc0d81b6faa..aecd2cff462b 100644
--- a/drivers/net/wireless/ipw2x00/Makefile
+++ b/drivers/net/wireless/ipw2x00/Makefile
@@ -4,3 +4,11 @@
 
 obj-$(CONFIG_IPW2100) += ipw2100.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
diff --git a/net/ieee80211/ieee80211_geo.c b/drivers/net/wireless/ipw2x00/libipw_geo.c
index 960ad13f5e9f..960ad13f5e9f 100644
--- a/net/ieee80211/ieee80211_geo.c
+++ b/drivers/net/wireless/ipw2x00/libipw_geo.c
diff --git a/net/ieee80211/ieee80211_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c
index a2f5616d5b09..a2f5616d5b09 100644
--- a/net/ieee80211/ieee80211_module.c
+++ b/drivers/net/wireless/ipw2x00/libipw_module.c
diff --git a/net/ieee80211/ieee80211_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c
index 9c67dfae4320..9c67dfae4320 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_rx.c
diff --git a/net/ieee80211/ieee80211_tx.c b/drivers/net/wireless/ipw2x00/libipw_tx.c
index f78f57e8844a..f78f57e8844a 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_tx.c
diff --git a/net/ieee80211/ieee80211_wx.c b/drivers/net/wireless/ipw2x00/libipw_wx.c
index 31ea3abfc327..31ea3abfc327 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_wx.c
diff --git a/net/Kconfig b/net/Kconfig
index c7d01c3a23c5..6ec2cce7c167 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -251,7 +251,6 @@ if WIRELESS
 
 source "net/wireless/Kconfig"
 source "net/mac80211/Kconfig"
-source "net/ieee80211/Kconfig"
 
 endif # WIRELESS
 
diff --git a/net/Makefile b/net/Makefile
index 83b064651f1d..e5af3dc3a037 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -51,7 +51,6 @@ obj-$(CONFIG_IP_DCCP)		+= dccp/
 obj-$(CONFIG_IP_SCTP)           += sctp/
 obj-y                           += wireless/
 obj-$(CONFIG_MAC80211)          += mac80211/
-obj-$(CONFIG_IEEE80211)         += ieee80211/
 obj-$(CONFIG_TIPC)              += tipc/
 obj-$(CONFIG_NETLABEL)          += netlabel/
 obj-$(CONFIG_IUCV)              += iucv/
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
deleted file mode 100644
index 46f24f4c9dc7..000000000000
--- a/net/ieee80211/Kconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-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.
diff --git a/net/ieee80211/Makefile b/net/ieee80211/Makefile
deleted file mode 100644
index 158963ff18d2..000000000000
--- a/net/ieee80211/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-obj-$(CONFIG_IEEE80211) += ieee80211.o
-ieee80211-objs := \
-        ieee80211_module.o \
-        ieee80211_tx.o \
-        ieee80211_rx.o \
-        ieee80211_wx.o \
-        ieee80211_geo.o
-