mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-04 09:59:32 +00:00
Code Issues Releases Wiki Activity

Staging: wlan-ng: Wireless Extension support is mandatory.

Browse source 
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>
This commit is contained in:
Solomon Peachy 2008-10-29 10:42:55 -04:00 committed by Greg Kroah-Hartman
parent 575a8a5c28
commit fc4a76ff19
4 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/wlan-ng/Kconfig
View file

@ -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

2
drivers/staging/wlan-ng/p80211netdev.c
View file

@ -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

7
drivers/staging/wlan-ng/p80211netdev.h
View file

@ -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 */

5
drivers/staging/wlan-ng/p80211wext.c
View file

@ -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 */