diff options
| author | Solomon Peachy | 2008-10-29 15:42:55 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-01-06 22:51:56 +0100 |
| commit | fc4a76ff199c40f2e8e5a0004dc625bbd54ed80e (patch) | |
| tree | 5973de013ae7198931fa625afd595f82cea7b7a6 /drivers/staging/wlan-ng | |
| parent | Staging: wlan-ng: Eliminate all backwards-compatible kernel code. (diff) | |
| download | kernel-qcow2-linux-fc4a76ff199c40f2e8e5a0004dc625bbd54ed80e.tar.gz kernel-qcow2-linux-fc4a76ff199c40f2e8e5a0004dc625bbd54ed80e.tar.xz kernel-qcow2-linux-fc4a76ff199c40f2e8e5a0004dc625bbd54ed80e.zip | |
Staging: wlan-ng: Wireless Extension support is mandatory.
So take away the option to disable it.
Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng')
| -rw-r--r-- | drivers/staging/wlan-ng/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211netdev.c | 2 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211netdev.h | 7 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211wext.c | 5 |
4 files changed, 1 insertions, 15 deletions
diff --git a/drivers/staging/wlan-ng/Kconfig b/drivers/staging/wlan-ng/Kconfig index a401bdb72a0c..38a21a095701 100644 --- a/drivers/staging/wlan-ng/Kconfig +++ b/drivers/staging/wlan-ng/Kconfig @@ -1,6 +1,6 @@ config PRISM2_USB tristate "Prism2.5/3 USB driver" - depends on WLAN_80211 && USB + depends on WLAN_80211 && USB && CONFIG_WIRELESS_EXT default n ---help--- This is the wlan-ng prism 2.5/3 USB driver for a wide range of diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index 98a72193e8d7..23507c7a54b0 100644 --- a/drivers/staging/wlan-ng/p80211netdev.c +++ b/drivers/staging/wlan-ng/p80211netdev.c @@ -866,12 +866,10 @@ int wlan_setup(wlandevice_t *wlandev) dev->open = p80211knetdev_open; dev->stop = p80211knetdev_stop; -#ifdef CONFIG_NET_WIRELESS #if (WIRELESS_EXT < 21) dev->get_wireless_stats = p80211wext_get_wireless_stats; #endif dev->wireless_handlers = &p80211wext_handler_def; -#endif netif_stop_queue(dev); #ifdef HAVE_CHANGE_MTU diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h index 5e5d475210db..227a1ead36d6 100644 --- a/drivers/staging/wlan-ng/p80211netdev.h +++ b/drivers/staging/wlan-ng/p80211netdev.h @@ -148,14 +148,12 @@ typedef struct p80211_frmrx_t u32 decrypt_err; } p80211_frmrx_t; -#ifdef WIRELESS_EXT /* called by /proc/net/wireless */ struct iw_statistics* p80211wext_get_wireless_stats(netdevice_t *dev); /* wireless extensions' ioctls */ int p80211wext_support_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd); extern struct iw_handler_def p80211wext_handler_def; int p80211wext_event_associated(struct wlandevice *wlandev, int assoc); -#endif /* wireless extensions */ /* WEP stuff */ #define NUM_WEPKEYS 4 @@ -232,17 +230,12 @@ typedef struct wlandevice /* 802.11 device statistics */ struct p80211_frmrx_t rx; -/* compatibility to wireless extensions */ -#ifdef WIRELESS_EXT struct iw_statistics wstats; /* jkriegl: iwspy fields */ u8 spy_number; char spy_address[IW_MAX_SPY][ETH_ALEN]; struct iw_quality spy_stat[IW_MAX_SPY]; - -#endif - } wlandevice_t; /* WEP stuff */ diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c index 82ec301b4313..32adf3f17747 100644 --- a/drivers/staging/wlan-ng/p80211wext.c +++ b/drivers/staging/wlan-ng/p80211wext.c @@ -75,8 +75,6 @@ static int p80211wext_giwrate(netdevice_t *dev, static int p80211wext_giwessid(netdevice_t *dev, struct iw_request_info *info, struct iw_point *data, char *essid); -/* compatibility to wireless extensions */ -#ifdef WIRELESS_EXT static u8 p80211_mhz_to_channel(u16 mhz) { @@ -1830,8 +1828,5 @@ int p80211wext_event_associated(wlandevice_t *wlandev, int assoc) } -#endif /* compatibility to wireless extensions */ - - |