Commit d86b5e0e authored by Adrian Bunk's avatar Adrian Bunk Committed by John W. Linville
Browse files

[PATCH] net/: fix the WIRELESS_EXT abuse 



This patch contains the following changes:
- add a CONFIG_WIRELESS_EXT select'ed by NET_RADIO for conditional
  code
- remove the now no longer required #ifdef CONFIG_NET_RADIO from some
  #include's

Based on a patch by Jean Tourrilhes <jt@hpl.hp.com>.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 747af1e1

drivers/net/wireless/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ menu "Wireless LAN (non-hamradio)" 
	depends on NETDEVICES



config NET_RADIO

	bool "Wireless LAN drivers (non-hamradio) & Wireless Extensions"

	bool "Wireless LAN drivers (non-hamradio)"

	select WIRELESS_EXT

	---help---

	  Support for wireless LANs and everything having to do with radio,

	  but not with amateur radio or FM broadcasting.

drivers/net/wireless/netwave_cs.c

+0 −2
Original line number Diff line number Diff line
@@ -55,10 +55,8 @@ 
#include <linux/etherdevice.h>

#include <linux/skbuff.h>

#include <linux/bitops.h>

#ifdef CONFIG_NET_RADIO

#include <linux/wireless.h>

#include <net/iw_handler.h>

#endif



#include <pcmcia/cs_types.h>

#include <pcmcia/cs.h>

drivers/net/wireless/wavelan.p.h

+1 −5
Original line number Diff line number Diff line
@@ -98,11 +98,7 @@ 
 * characteristics of the hardware.  Applications such as mobile IP may

 * take advantage of it.

 *

 * You will need to enable the CONFIG_NET_RADIO define in the kernel

 * configuration to enable the wireless extensions (this is the one

 * giving access to the radio network device choice).

 *

 * It might also be a good idea as well to fetch the wireless tools to

 * It might be a good idea as well to fetch the wireless tools to

 * configure the device and play a bit.

 */

drivers/net/wireless/wavelan_cs.p.h

+1 −8
Original line number Diff line number Diff line
@@ -99,11 +99,7 @@ 
 * caracteristics of the hardware in a standard way and support for

 * applications for taking advantage of it (like Mobile IP).

 *

 * You will need to enable the CONFIG_NET_RADIO define in the kernel

 * configuration to enable the wireless extensions (this is the one

 * giving access to the radio network device choice).

 *

 * It might also be a good idea as well to fetch the wireless tools to

 * It might be a good idea as well to fetch the wireless tools to

 * configure the device and play a bit.

 */
@@ -440,11 +436,8 @@ 
#include <linux/ioport.h>

#include <linux/fcntl.h>

#include <linux/ethtool.h>



#ifdef CONFIG_NET_RADIO

#include <linux/wireless.h>		/* Wireless extensions */

#include <net/iw_handler.h>		/* New driver API */

#endif



/* Pcmcia headers that we need */

#include <pcmcia/cs_types.h>

net/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -217,6 +217,9 @@ source "net/irda/Kconfig" 
source "net/bluetooth/Kconfig"

source "net/ieee80211/Kconfig"



config WIRELESS_EXT

	bool



endif   # if NET

endmenu # Networking

CRA Git | Maintained and supported by SUSTech CRA and CCSE