In-tree Kconfig update for ipw2200-1.1.3

Kconfig updates for IPW2200_QOS and IPW2200_RADIOTAP IPW2200_PROMISCUOUS

diff -urp ipw2200-1.1.3/in-tree/Kconfig.ipw2200 ipw2200-1.1.3-kconfig/in-tree/Kconfig.ipw2200
--- ipw2200-1.1.3/in-tree/Kconfig.ipw2200	2006-06-11 23:07:41.000000000 -0700
+++ ipw2200-1.1.3-kconfig/in-tree/Kconfig.ipw2200	2006-06-12 02:26:31.000000000 -0700
@@ -1,7 +1,8 @@
 config IPW2200
 	tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
-	depends on IEEE80211 && PCI && NET_RADIO
+	depends on NET_RADIO && PCI
 	select FW_LOADER
+	select IEEE80211
 	---help---
           A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
 	  Connection adapters. 
@@ -13,7 +14,7 @@ config IPW2200
 	  In order to use this driver, you will need a firmware image for it.
           You can obtain the firmware from
 	  <http://ipw2200.sf.net/>.  See the above referenced README.ipw2200 
-	  for information on where to install the firmare images.
+	  for information on where to install the firmware images.
 
           You will also very likely need the Wireless Tools in order to
           configure your card:
@@ -21,47 +22,27 @@ config IPW2200
           <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
  
           If you want to compile the driver as a module ( = code which can be
-          inserted in and remvoed from the running kernel whenever you want),
+          inserted in and removed from the running kernel whenever you want),
           say M here and read <file:Documentation/modules.txt>.  The module
           will be called ipw2200.ko.
 
-config IPW2200_DEBUG
-	bool "Enable full debugging output in IPW2200 module."
-	depends on IPW2200
-	---help---
-	  This option will enable debug tracing output for the IPW2200.  
-
-	  This will result in the kernel module being ~100k larger.  You can 
-	  control which debug output is sent to the kernel log by setting the 
-	  value in 
-
-	  /sys/bus/pci/drivers/ipw2200/debug_level
-
-	  This entry will only exist if this option is enabled.
-
-	  To set a value, simply echo an 8-byte hex value to the same file:
-
-	  % echo 0x00000FFO > /sys/bus/pci/drivers/ipw2200/debug_level
-
-	  You can find the list of debug mask values in 
-	  drivers/net/wireless/ipw2200.h
-
-	  If you are not trying to debug or develop the IPW2200 driver, you 
-	  most likely want to say N here.
-
 config IPW2200_MONITOR
-        bool "Enable RF monitor mode"
+        bool "Enable promiscuous mode"
         depends on IPW2200
         ---help---
-	  Enables monitor (aka promiscuous) mode support for the ipw2200 
-	  driver.  With this feature compiled into the driver, you can 
-	  switch to monitor mode via the Wireless Tool's mode command.
-	  While in monitor mode, no packets can be sent.
+	  Enables promiscuous/monitor mode support for the ipw2200 driver.
+	  With this feature compiled into the driver, you can switch to 
+	  promiscuous mode via the Wireless Tool's Monitor mode.  While in this
+	  mode, no packets can be sent.
+
+config IPW2200_RADIOTAP
+	bool "Enable radiotap format 802.11 raw packet support"
+	depends on IPW2200_MONITOR
 
 config IPW2200_PROMISCUOUS
-	bool "Enable creation of a RF radiotap promiscuous interface."
-	depends on IPW2200
-	select IEEE80211_RADIOTAP
+	bool "Enable creation of a RF radiotap promiscuous interface"
+	depends on IPW2200_MONITOR
+	select IPW2200_RADIOTAP
 	---help---
           Enables the creation of a second interface prefixed 'rtap'. 
           This second interface will provide every received in radiotap
@@ -81,3 +62,20 @@ config IPW2200_PROMISCUOUS
           it on via sysfs:
 	
             % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
+
+config IPW2200_QOS
+        bool "Enable QoS support"
+        depends on IPW2200 && EXPERIMENTAL
+
+config IPW2200_DEBUG
+	bool "Enable full debugging output in IPW2200 module."
+	depends on IPW2200
+	---help---
+	  This option will enable low level debug tracing output for IPW2200.  
+
+	  Note, normal debug code is already compiled in. This low level
+	  debug option enables debug on hot paths (e.g Tx, Rx, ISR) and
+	  will result in the kernel module being ~70 larger.  Most users
+	  will typically not need this high verbosity debug information. 
+
+	  If you are not sure, say N here.