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>

diff --git a/drivers/staging/wlan-ng/Kconfig b/drivers/staging/wlan-ng/Kconfig
index a401bdb72a0cce675a31627d0a93d040898fa4cb..38a21a09570173dc3be2dffb65efc0385ca859f0 100644 (file)
--- 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 98a72193e8d720137bddc587014e666a13485298..23507c7a54b0fd4bf252d6d18d4d6a90c1610846 100644 (file)
--- 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 5e5d475210dbb3eac8e2f44ff87285c3a810355c..227a1ead36d69b45421180ee8448e35cc398b6e0 100644 (file)
--- 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 82ec301b4313fd2360d0e1f82f61483720d7ba90..32adf3f177470a2a44b6274005f1da215b49b6e2 100644 (file)
--- 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 */
-
-