[wireless prism54] remove WIRELESS_EXT ifdefs

diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index dd2eee847ce49c8db46e1780871c2324b021aa08..4ca073b9e5dc8ad66f7479be18b01ee218170f29 100644 (file)
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -33,9 +33,7 @@
 #include "isl_oid.h"           /* additional types and defs for isl38xx fw */
 #include "oid_mgt.h"
 
-#if WIRELESS_EXT > 12
 #include <net/iw_handler.h>    /* New driver API */
-#endif                         /* WIRELESS_EXT > 12 */
 
 static int init_mode = CARD_DEFAULT_IW_MODE;
 static int init_channel = CARD_DEFAULT_CHANNEL;
@@ -693,7 +691,6 @@ prism54_translate_bss(struct net_device *ndev, char *current_ev,
        current_ev =
            iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
 
-#if WIRELESS_EXT > 14
        if (priv->wpa) {
                u8 wpa_ie[MAX_WPA_IE_LEN];
                char *buf, *p;
@@ -716,7 +713,6 @@ prism54_translate_bss(struct net_device *ndev, char *current_ev,
                        kfree(buf);
                }
        }
-#endif                         /* WIRELESS_EXT > 14 */
 
        return current_ev;
 }
@@ -2025,8 +2021,6 @@ prism54_set_oid(struct net_device *ndev, struct iw_request_info *info,
        return ret;
 }
 
-#if WIRELESS_EXT > 12
-
 static const iw_handler prism54_handler[] = {
        (iw_handler) prism54_commit,    /* SIOCSIWCOMMIT */
        (iw_handler) prism54_get_name,  /* SIOCGIWNAME */
@@ -2044,28 +2038,16 @@ static const iw_handler prism54_handler[] = {
        (iw_handler) NULL,      /* SIOCGIWPRIV */
        (iw_handler) NULL,      /* SIOCSIWSTATS */
        (iw_handler) NULL,      /* SIOCGIWSTATS */
-#if WIRELESS_EXT > 15
        iw_handler_set_spy,     /* SIOCSIWSPY */
        iw_handler_get_spy,     /* SIOCGIWSPY */
        iw_handler_set_thrspy,  /* SIOCSIWTHRSPY */
        iw_handler_get_thrspy,  /* SIOCGIWTHRSPY */
-#else                          /* WIRELESS_EXT > 15 */
-       (iw_handler) NULL,      /* SIOCSIWSPY */
-       (iw_handler) NULL,      /* SIOCGIWSPY */
-       (iw_handler) NULL,      /* -- hole -- */
-       (iw_handler) NULL,      /* -- hole -- */
-#endif                         /* WIRELESS_EXT > 15 */
        (iw_handler) prism54_set_wap,   /* SIOCSIWAP */
        (iw_handler) prism54_get_wap,   /* SIOCGIWAP */
        (iw_handler) NULL,      /* -- hole -- */
        (iw_handler) NULL,      /* SIOCGIWAPLIST depreciated */
-#if WIRELESS_EXT > 13
        (iw_handler) prism54_set_scan,  /* SIOCSIWSCAN */
        (iw_handler) prism54_get_scan,  /* SIOCGIWSCAN */
-#else                          /* WIRELESS_EXT > 13 */
-       (iw_handler) NULL,      /* SIOCSIWSCAN */
-       (iw_handler) NULL,      /* SIOCGIWSCAN */
-#endif                         /* WIRELESS_EXT > 13 */
        (iw_handler) prism54_set_essid, /* SIOCSIWESSID */
        (iw_handler) prism54_get_essid, /* SIOCGIWESSID */
        (iw_handler) prism54_set_nick,  /* SIOCSIWNICKN */
@@ -2171,4 +2153,3 @@ const struct iw_handler_def prism54_handler_def = {
        .private_args = (struct iw_priv_args *) prism54_private_args,
 };
 
-#endif                         /* WIRELESS_EXT > 12 */

diff --git a/drivers/net/wireless/prism54/isl_ioctl.h b/drivers/net/wireless/prism54/isl_ioctl.h
index a90a5a11f61b97f19dc8c4c6c67161be149a8a69..0e43dea95ac28196cd5a2333416d18fcced84640 100644 (file)
--- a/drivers/net/wireless/prism54/isl_ioctl.h
+++ b/drivers/net/wireless/prism54/isl_ioctl.h
@@ -25,10 +25,7 @@
 #include "islpci_mgt.h"
 #include "islpci_dev.h"
 
-#if WIRELESS_EXT > 12
 #include <net/iw_handler.h>    /* New driver API */
-#endif                         /* WIRELESS_EXT > 12 */
-
 
 #define SUPPORTED_WIRELESS_EXT                  16
 
@@ -53,8 +50,6 @@ int prism54_set_mac_address(struct net_device *, void *);
 
 int prism54_ioctl(struct net_device *, struct ifreq *, int);
 
-#if WIRELESS_EXT > 12
 extern const struct iw_handler_def prism54_handler_def;
-#endif                         /* WIRELESS_EXT > 12 */
 
 #endif                         /* _ISL_IOCTL_H */

diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index 72c3b77755eb7da852067bc8f98eb1e7c7aec366..535177125e3fbf8832d5e46a1f1db4ec43f66668 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -695,10 +695,8 @@ islpci_setup(struct pci_dev *pdev)
        ndev->get_stats = &islpci_statistics;
        ndev->get_wireless_stats = &prism54_get_wireless_stats;
        ndev->do_ioctl = &prism54_ioctl;
-#if WIRELESS_EXT > 12
        ndev->wireless_handlers =
            (struct iw_handler_def *) &prism54_handler_def;
-#endif                         /* WIRELESS_EXT > 12 */
 
        ndev->hard_start_xmit = &islpci_eth_transmit;
        /* ndev->set_multicast_list = &islpci_set_multicast_list; */

diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c
index 3527d97d5613eb11795e1f4c70135a78e7516a26..787889fec2aa1eb3c17b6acb00bb51f512e4b201 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_mgt.c
+++ b/drivers/net/wireless/prism54/islpci_mgt.c
@@ -32,9 +32,7 @@
 #include "isl_oid.h"           /* additional types and defs for isl38xx fw */
 #include "isl_ioctl.h"
 
-#if WIRELESS_EXT > 12
 #include <net/iw_handler.h>
-#endif
 
 /******************************************************************************
         Global variable definition section