Staging: rtl8192e: Remove support for legacy wireless extentions

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index f36dba375e71ac85f9d31d81a488c1dc97b44da7..92c191082bde4a9c69eb78e313571bb49818b3af 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -5661,17 +5661,10 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
 
        dev->netdev_ops = &rtl8192_netdev_ops;
 
-         //DMESG("Oops: i'm coming\n");
-#if WIRELESS_EXT >= 12
-#if WIRELESS_EXT < 17
-        dev->get_wireless_stats = r8192_get_wireless_stats;
-#endif
-        dev->wireless_handlers = (struct iw_handler_def *) &r8192_wx_handlers_def;
-#endif
-       //dev->get_wireless_stats = r8192_get_wireless_stats;
+       dev->wireless_handlers = &r8192_wx_handlers_def;
        dev->type=ARPHRD_ETHER;
 
-       dev->watchdog_timeo = HZ*3;     //modified by john, 0805
+       dev->watchdog_timeo = HZ*3;
 
        if (dev_alloc_name(dev, ifname) < 0){
                 RT_TRACE(COMP_INIT, "Oops: devname already taken! Trying wlan%%d...\n");
@@ -5835,7 +5828,6 @@ static int __init rtl8192_pci_module_init(void)
        printk(KERN_INFO "\nLinux kernel driver for RTL8192 based WLAN cards\n");
        printk(KERN_INFO "Copyright (c) 2007-2008, Realsil Wlan\n");
        RT_TRACE(COMP_INIT, "Initializing module");
-       RT_TRACE(COMP_INIT, "Wireless extensions version %d", WIRELESS_EXT);
        rtl8192_proc_module_init();
       if(0!=pci_register_driver(&rtl8192_pci_driver))
        {

diff --git a/drivers/staging/rtl8192e/r8192E_wx.c b/drivers/staging/rtl8192e/r8192E_wx.c
index 15b08013aae0ad46478e54f4a91a139ac4cb0d23..7b5ac0d26812433ad5497f4a8f1b27cc2142bb73 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E_wx.c
+++ b/drivers/staging/rtl8192e/r8192E_wx.c
@@ -364,10 +364,10 @@ static int rtl8180_wx_get_range(struct net_device *dev,
        }
        range->num_frequency = val;
        range->num_channels = val;
-#if WIRELESS_EXT > 17
+
        range->enc_capa = IW_ENC_CAPA_WPA|IW_ENC_CAPA_WPA2|
                          IW_ENC_CAPA_CIPHER_TKIP|IW_ENC_CAPA_CIPHER_CCMP;
-#endif
+
        tmp->scan_capa = 0x01;
        return 0;
 }
@@ -900,7 +900,6 @@ exit:
        return err;
 }
 
-#if (WIRELESS_EXT >= 18)
 static int r8192_wx_set_enc_ext(struct net_device *dev,
                                         struct iw_request_info *info,
                                         union iwreq_data *wrqu, char *extra)
@@ -1040,7 +1039,7 @@ static int r8192_wx_set_mlme(struct net_device *dev,
        up(&priv->wx_sem);
        return ret;
 }
-#endif
+
 static int r8192_wx_set_gen_ie(struct net_device *dev,
                                         struct iw_request_info *info,
                                         union iwreq_data *data, char *extra)
@@ -1126,11 +1125,7 @@ static iw_handler r8192_wx_handlers[] =
         NULL,                     /* SIOCWIWTHRSPY */
         r8192_wx_set_wap,                /* SIOCSIWAP */
         r8192_wx_get_wap,         /* SIOCGIWAP */
-#if (WIRELESS_EXT >= 18)
-        r8192_wx_set_mlme,                     /* MLME-- */
-#else
-        NULL,
-#endif
+       r8192_wx_set_mlme,        /* MLME-- */
         dummy,                     /* SIOCGIWAPLIST -- depricated */
         r8192_wx_set_scan,        /* SIOCSIWSCAN */
         r8192_wx_get_scan,        /* SIOCGIWSCAN */
@@ -1158,15 +1153,9 @@ static iw_handler r8192_wx_handlers[] =
        NULL,                   /*---hole---*/
        r8192_wx_set_gen_ie,//NULL,                     /* SIOCSIWGENIE */
        NULL,                   /* SIOCSIWGENIE */
-#if (WIRELESS_EXT >= 18)
        r8192_wx_set_auth,//NULL,                       /* SIOCSIWAUTH */
        NULL,//r8192_wx_get_auth,//NULL,                        /* SIOCSIWAUTH */
        r8192_wx_set_enc_ext,                   /* SIOCSIWENCODEEXT */
-#else
-       NULL,
-       NULL,
-       NULL,
-#endif
        NULL,//r8192_wx_get_enc_ext,//NULL,                     /* SIOCSIWENCODEEXT */
        NULL,                   /* SIOCSIWPMKSA */
        NULL,                    /*---hole---*/
@@ -1214,7 +1203,6 @@ static iw_handler r8192_private_handler[] = {
        r8192_wx_adapter_power_status,
 };
 
-//#if WIRELESS_EXT >= 17
 struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -1243,7 +1231,6 @@ struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev)
        wstats->qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
        return wstats;
 }
-//#endif
 
 
 struct iw_handler_def  r8192_wx_handlers_def={
@@ -1252,8 +1239,6 @@ struct iw_handler_def  r8192_wx_handlers_def={
        .private = r8192_private_handler,
        .num_private = sizeof(r8192_private_handler) / sizeof(iw_handler),
        .num_private_args = sizeof(r8192_private_args) / sizeof(struct iw_priv_args),
-#if WIRELESS_EXT >= 17
        .get_wireless_stats = r8192_get_wireless_stats,
-#endif
        .private_args = (struct iw_priv_args *)r8192_private_args,
 };