Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ipw2x00: relocate ipw2100/ipw2200 to common directory

Signed-off-by: John W. Linville <linville@tuxdriver.com>

+159 -149
+1 -146
drivers/net/wireless/Kconfig
··· 123 123 To compile this driver as a module, choose M here: the module will be 124 124 called ray_cs. If unsure, say N. 125 125 126 - config IPW2100 127 - tristate "Intel PRO/Wireless 2100 Network Connection" 128 - depends on PCI && WLAN_80211 129 - select WIRELESS_EXT 130 - select FW_LOADER 131 - select LIB80211 132 - select IEEE80211 133 - ---help--- 134 - A driver for the Intel PRO/Wireless 2100 Network 135 - Connection 802.11b wireless network adapter. 136 - 137 - See <file:Documentation/networking/README.ipw2100> for information on 138 - the capabilities currently enabled in this driver and for tips 139 - for debugging issues and problems. 140 - 141 - In order to use this driver, you will need a firmware image for it. 142 - You can obtain the firmware from 143 - <http://ipw2100.sf.net/>. Once you have the firmware image, you 144 - will need to place it in /lib/firmware. 145 - 146 - You will also very likely need the Wireless Tools in order to 147 - configure your card: 148 - 149 - <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. 150 - 151 - It is recommended that you compile this driver as a module (M) 152 - rather than built-in (Y). This driver requires firmware at device 153 - initialization time, and when built-in this typically happens 154 - before the filesystem is accessible (hence firmware will be 155 - unavailable and initialization will fail). If you do choose to build 156 - this driver into your kernel image, you can avoid this problem by 157 - including the firmware and a firmware loader in an initramfs. 158 - 159 - config IPW2100_MONITOR 160 - bool "Enable promiscuous mode" 161 - depends on IPW2100 162 - ---help--- 163 - Enables promiscuous/monitor mode support for the ipw2100 driver. 164 - With this feature compiled into the driver, you can switch to 165 - promiscuous mode via the Wireless Tool's Monitor mode. While in this 166 - mode, no packets can be sent. 167 - 168 - config IPW2100_DEBUG 169 - bool "Enable full debugging output in IPW2100 module." 170 - depends on IPW2100 171 - ---help--- 172 - This option will enable debug tracing output for the IPW2100. 173 - 174 - This will result in the kernel module being ~60k larger. You can 175 - control which debug output is sent to the kernel log by setting the 176 - value in 177 - 178 - /sys/bus/pci/drivers/ipw2100/debug_level 179 - 180 - This entry will only exist if this option is enabled. 181 - 182 - If you are not trying to debug or develop the IPW2100 driver, you 183 - most likely want to say N here. 184 - 185 - config IPW2200 186 - tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection" 187 - depends on PCI && WLAN_80211 188 - select WIRELESS_EXT 189 - select FW_LOADER 190 - select LIB80211 191 - select IEEE80211 192 - ---help--- 193 - A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network 194 - Connection adapters. 195 - 196 - See <file:Documentation/networking/README.ipw2200> for 197 - information on the capabilities currently enabled in this 198 - driver and for tips for debugging issues and problems. 199 - 200 - In order to use this driver, you will need a firmware image for it. 201 - You can obtain the firmware from 202 - <http://ipw2200.sf.net/>. See the above referenced README.ipw2200 203 - for information on where to install the firmware images. 204 - 205 - You will also very likely need the Wireless Tools in order to 206 - configure your card: 207 - 208 - <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. 209 - 210 - It is recommended that you compile this driver as a module (M) 211 - rather than built-in (Y). This driver requires firmware at device 212 - initialization time, and when built-in this typically happens 213 - before the filesystem is accessible (hence firmware will be 214 - unavailable and initialization will fail). If you do choose to build 215 - this driver into your kernel image, you can avoid this problem by 216 - including the firmware and a firmware loader in an initramfs. 217 - 218 - config IPW2200_MONITOR 219 - bool "Enable promiscuous mode" 220 - depends on IPW2200 221 - ---help--- 222 - Enables promiscuous/monitor mode support for the ipw2200 driver. 223 - With this feature compiled into the driver, you can switch to 224 - promiscuous mode via the Wireless Tool's Monitor mode. While in this 225 - mode, no packets can be sent. 226 - 227 - config IPW2200_RADIOTAP 228 - bool "Enable radiotap format 802.11 raw packet support" 229 - depends on IPW2200_MONITOR 230 - 231 - config IPW2200_PROMISCUOUS 232 - bool "Enable creation of a RF radiotap promiscuous interface" 233 - depends on IPW2200_MONITOR 234 - select IPW2200_RADIOTAP 235 - ---help--- 236 - Enables the creation of a second interface prefixed 'rtap'. 237 - This second interface will provide every received in radiotap 238 - format. 239 - 240 - This is useful for performing wireless network analysis while 241 - maintaining an active association. 242 - 243 - Example usage: 244 - 245 - % modprobe ipw2200 rtap_iface=1 246 - % ifconfig rtap0 up 247 - % tethereal -i rtap0 248 - 249 - If you do not specify 'rtap_iface=1' as a module parameter then 250 - the rtap interface will not be created and you will need to turn 251 - it on via sysfs: 252 - 253 - % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface 254 - 255 - config IPW2200_QOS 256 - bool "Enable QoS support" 257 - depends on IPW2200 && EXPERIMENTAL 258 - 259 - config IPW2200_DEBUG 260 - bool "Enable full debugging output in IPW2200 module." 261 - depends on IPW2200 262 - ---help--- 263 - This option will enable low level debug tracing output for IPW2200. 264 - 265 - Note, normal debug code is already compiled in. This low level 266 - debug option enables debug on hot paths (e.g Tx, Rx, ISR) and 267 - will result in the kernel module being ~70 larger. Most users 268 - will typically not need this high verbosity debug information. 269 - 270 - If you are not sure, say N here. 271 - 272 126 config LIBERTAS 273 127 tristate "Marvell 8xxx Libertas WLAN driver support" 274 128 depends on WLAN_80211 ··· 568 714 source "drivers/net/wireless/p54/Kconfig" 569 715 source "drivers/net/wireless/ath5k/Kconfig" 570 716 source "drivers/net/wireless/ath9k/Kconfig" 717 + source "drivers/net/wireless/ipw2x00/Kconfig" 571 718 source "drivers/net/wireless/iwlwifi/Kconfig" 572 719 source "drivers/net/wireless/hostap/Kconfig" 573 720 source "drivers/net/wireless/b43/Kconfig"
+2 -3
drivers/net/wireless/Makefile
··· 2 2 # Makefile for the Linux Wireless network device drivers. 3 3 # 4 4 5 - obj-$(CONFIG_IPW2100) += ipw2100.o 6 - 7 - obj-$(CONFIG_IPW2200) += ipw2200.o 5 + obj-$(CONFIG_IPW2100) += ipw2x00/ 6 + obj-$(CONFIG_IPW2200) += ipw2x00/ 8 7 9 8 obj-$(CONFIG_STRIP) += strip.o 10 9 obj-$(CONFIG_ARLAN) += arlan.o
drivers/net/wireless/ipw2100.c drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/ipw2100.h drivers/net/wireless/ipw2x00/ipw2100.h
drivers/net/wireless/ipw2200.c drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/ipw2200.h drivers/net/wireless/ipw2x00/ipw2200.h
+150
drivers/net/wireless/ipw2x00/Kconfig
··· 1 + # 2 + # Intel Centrino wireless drivers 3 + # 4 + 5 + config IPW2100 6 + tristate "Intel PRO/Wireless 2100 Network Connection" 7 + depends on PCI && WLAN_80211 8 + select WIRELESS_EXT 9 + select FW_LOADER 10 + select LIB80211 11 + select IEEE80211 12 + ---help--- 13 + A driver for the Intel PRO/Wireless 2100 Network 14 + Connection 802.11b wireless network adapter. 15 + 16 + See <file:Documentation/networking/README.ipw2100> for information on 17 + the capabilities currently enabled in this driver and for tips 18 + for debugging issues and problems. 19 + 20 + In order to use this driver, you will need a firmware image for it. 21 + You can obtain the firmware from 22 + <http://ipw2100.sf.net/>. Once you have the firmware image, you 23 + will need to place it in /lib/firmware. 24 + 25 + You will also very likely need the Wireless Tools in order to 26 + configure your card: 27 + 28 + <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. 29 + 30 + It is recommended that you compile this driver as a module (M) 31 + rather than built-in (Y). This driver requires firmware at device 32 + initialization time, and when built-in this typically happens 33 + before the filesystem is accessible (hence firmware will be 34 + unavailable and initialization will fail). If you do choose to build 35 + this driver into your kernel image, you can avoid this problem by 36 + including the firmware and a firmware loader in an initramfs. 37 + 38 + config IPW2100_MONITOR 39 + bool "Enable promiscuous mode" 40 + depends on IPW2100 41 + ---help--- 42 + Enables promiscuous/monitor mode support for the ipw2100 driver. 43 + With this feature compiled into the driver, you can switch to 44 + promiscuous mode via the Wireless Tool's Monitor mode. While in this 45 + mode, no packets can be sent. 46 + 47 + config IPW2100_DEBUG 48 + bool "Enable full debugging output in IPW2100 module." 49 + depends on IPW2100 50 + ---help--- 51 + This option will enable debug tracing output for the IPW2100. 52 + 53 + This will result in the kernel module being ~60k larger. You can 54 + control which debug output is sent to the kernel log by setting the 55 + value in 56 + 57 + /sys/bus/pci/drivers/ipw2100/debug_level 58 + 59 + This entry will only exist if this option is enabled. 60 + 61 + If you are not trying to debug or develop the IPW2100 driver, you 62 + most likely want to say N here. 63 + 64 + config IPW2200 65 + tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection" 66 + depends on PCI && WLAN_80211 67 + select WIRELESS_EXT 68 + select FW_LOADER 69 + select LIB80211 70 + select IEEE80211 71 + ---help--- 72 + A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network 73 + Connection adapters. 74 + 75 + See <file:Documentation/networking/README.ipw2200> for 76 + information on the capabilities currently enabled in this 77 + driver and for tips for debugging issues and problems. 78 + 79 + In order to use this driver, you will need a firmware image for it. 80 + You can obtain the firmware from 81 + <http://ipw2200.sf.net/>. See the above referenced README.ipw2200 82 + for information on where to install the firmware images. 83 + 84 + You will also very likely need the Wireless Tools in order to 85 + configure your card: 86 + 87 + <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. 88 + 89 + It is recommended that you compile this driver as a module (M) 90 + rather than built-in (Y). This driver requires firmware at device 91 + initialization time, and when built-in this typically happens 92 + before the filesystem is accessible (hence firmware will be 93 + unavailable and initialization will fail). If you do choose to build 94 + this driver into your kernel image, you can avoid this problem by 95 + including the firmware and a firmware loader in an initramfs. 96 + 97 + config IPW2200_MONITOR 98 + bool "Enable promiscuous mode" 99 + depends on IPW2200 100 + ---help--- 101 + Enables promiscuous/monitor mode support for the ipw2200 driver. 102 + With this feature compiled into the driver, you can switch to 103 + promiscuous mode via the Wireless Tool's Monitor mode. While in this 104 + mode, no packets can be sent. 105 + 106 + config IPW2200_RADIOTAP 107 + bool "Enable radiotap format 802.11 raw packet support" 108 + depends on IPW2200_MONITOR 109 + 110 + config IPW2200_PROMISCUOUS 111 + bool "Enable creation of a RF radiotap promiscuous interface" 112 + depends on IPW2200_MONITOR 113 + select IPW2200_RADIOTAP 114 + ---help--- 115 + Enables the creation of a second interface prefixed 'rtap'. 116 + This second interface will provide every received in radiotap 117 + format. 118 + 119 + This is useful for performing wireless network analysis while 120 + maintaining an active association. 121 + 122 + Example usage: 123 + 124 + % modprobe ipw2200 rtap_iface=1 125 + % ifconfig rtap0 up 126 + % tethereal -i rtap0 127 + 128 + If you do not specify 'rtap_iface=1' as a module parameter then 129 + the rtap interface will not be created and you will need to turn 130 + it on via sysfs: 131 + 132 + % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface 133 + 134 + config IPW2200_QOS 135 + bool "Enable QoS support" 136 + depends on IPW2200 && EXPERIMENTAL 137 + 138 + config IPW2200_DEBUG 139 + bool "Enable full debugging output in IPW2200 module." 140 + depends on IPW2200 141 + ---help--- 142 + This option will enable low level debug tracing output for IPW2200. 143 + 144 + Note, normal debug code is already compiled in. This low level 145 + debug option enables debug on hot paths (e.g Tx, Rx, ISR) and 146 + will result in the kernel module being ~70 larger. Most users 147 + will typically not need this high verbosity debug information. 148 + 149 + If you are not sure, say N here. 150 +
+6
drivers/net/wireless/ipw2x00/Makefile
··· 1 + # 2 + # Makefile for the Intel Centrino wireless drivers 3 + # 4 + 5 + obj-$(CONFIG_IPW2100) += ipw2100.o 6 + obj-$(CONFIG_IPW2200) += ipw2200.o