Staging: rtl8192su: remove support for older wireless extensions

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211.h b/drivers/staging/rtl8192su/ieee80211/ieee80211.h
index 7d97300924a676c006fb682943188f7fd3259838..b1f49f098ce8b09ab969fdfa19a31f970e1518c0 100644 (file)
--- a/drivers/staging/rtl8192su/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192su/ieee80211/ieee80211.h
@@ -379,13 +379,11 @@ enum      _ReasonCode{
 #define ieee80211_wx_get_scan          ieee80211_wx_get_scan_rsl
 #define ieee80211_wx_set_encode                ieee80211_wx_set_encode_rsl
 #define ieee80211_wx_get_encode                ieee80211_wx_get_encode_rsl
-#if WIRELESS_EXT >= 18
+
 #define ieee80211_wx_set_mlme          ieee80211_wx_set_mlme_rsl
 #define ieee80211_wx_set_auth          ieee80211_wx_set_auth_rsl
 #define ieee80211_wx_set_encode_ext    ieee80211_wx_set_encode_ext_rsl
 #define ieee80211_wx_get_encode_ext    ieee80211_wx_get_encode_ext_rsl
-#endif
-
 
 typedef struct ieee_param {
        u32 cmd;
@@ -416,16 +414,6 @@ typedef struct ieee_param {
        } u;
 }ieee_param;
 
-
-#if WIRELESS_EXT < 17
-#define IW_QUAL_QUAL_INVALID   0x10
-#define IW_QUAL_LEVEL_INVALID  0x20
-#define IW_QUAL_NOISE_INVALID  0x40
-#define IW_QUAL_QUAL_UPDATED   0x1
-#define IW_QUAL_LEVEL_UPDATED  0x2
-#define IW_QUAL_NOISE_UPDATED  0x4
-#endif
-
 #define MSECS(t) msecs_to_jiffies(t)
 #define msleep_interruptible_rsl  msleep_interruptible
 
@@ -2552,7 +2540,6 @@ extern int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
 extern int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
                                   struct iw_request_info *info,
                                   union iwreq_data *wrqu, char *key);
-#if WIRELESS_EXT >= 18
 extern int ieee80211_wx_get_encode_ext(struct ieee80211_device *ieee,
                             struct iw_request_info *info,
                             union iwreq_data* wrqu, char *extra);
@@ -2565,7 +2552,6 @@ extern int ieee80211_wx_set_auth(struct ieee80211_device *ieee,
 extern int ieee80211_wx_set_mlme(struct ieee80211_device *ieee,
                                struct iw_request_info *info,
                                union iwreq_data *wrqu, char *extra);
-#endif
 extern int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len);
 
 /* ieee80211_softmac.c */

diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c
index 6662d55d2215335dc7dda49bbfa6d6e6c0304131..9a0ed2dfc27207d282f42b6fa5f0918df9d4a744 100644 (file)
--- a/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c
+++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c
@@ -615,8 +615,6 @@ static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *pri
        return 0;
 }
 
-
-#if WIRELESS_EXT >= 18
 static void ieee80211_michael_mic_failure(struct net_device *dev,
                                       struct ieee80211_hdr_4addr *hdr,
                                       int keyidx)
@@ -637,29 +635,6 @@ static void ieee80211_michael_mic_failure(struct net_device *dev,
        wrqu.data.length = sizeof(ev);
        wireless_send_event(dev, IWEVMICHAELMICFAILURE, &wrqu, (char *) &ev);
 }
-#elif WIRELESS_EXT >= 15
-static void ieee80211_michael_mic_failure(struct net_device *dev,
-                                      struct ieee80211_hdr_4addr *hdr,
-                                      int keyidx)
-{
-       union iwreq_data wrqu;
-       char buf[128];
-
-       /* TODO: needed parameters: count, keyid, key type, TSC */
-       sprintf(buf, "MLME-MICHAELMICFAILURE.indication(keyid=%d %scast addr="
-               MAC_FMT ")", keyidx, hdr->addr1[0] & 0x01 ? "broad" : "uni",
-               MAC_ARG(hdr->addr2));
-       memset(&wrqu, 0, sizeof(wrqu));
-       wrqu.data.length = strlen(buf);
-       wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
-}
-#else /* WIRELESS_EXT >= 15 */
-static inline void ieee80211_michael_mic_failure(struct net_device *dev,
-                                             struct ieee80211_hdr_4addr *hdr,
-                                             int keyidx)
-{
-}
-#endif /* WIRELESS_EXT >= 15 */
 
 static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
                                     int hdr_len, void *priv)

diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
index bbc9759e2c3db157cfe9733bf9877903cdd27b29..27f56389b6a92e8ad3f2a2df3cdf92ea6a4e71e8 100644 (file)
--- a/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
@@ -986,7 +986,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
 
        //IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, skb->data, skb->len);
 #ifdef NOT_YET
-#if WIRELESS_EXT > 15
        /* Put this code here so that we avoid duplicating it in all
         * Rx paths. - Jean II */
 #ifdef IW_WIRELESS_SPY         /* defined in iw_handler.h */
@@ -1000,18 +999,16 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                wireless_spy_update(dev, hdr->addr2, &wstats);
        }
 #endif /* IW_WIRELESS_SPY */
-#endif /* WIRELESS_EXT > 15 */
        hostap_update_rx_stats(local->ap, hdr, rx_stats);
 #endif
 
-#if WIRELESS_EXT > 15
        if (ieee->iw_mode == IW_MODE_MONITOR) {
                ieee80211_monitor_rx(ieee, skb, rx_stats);
                stats->rx_packets++;
                stats->rx_bytes += skb->len;
                return 1;
        }
-#endif
+
        if (ieee->host_decrypt) {
                int idx = 0;
                if (skb->len >= hdrlen + 3)

diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c
index 79bb48002269a3d9cde49db3a96ede546f14add9..ee04691d9330b4e1f4e8cdcee9e0133a7e713762 100644 (file)
--- a/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c
+++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c
@@ -211,37 +211,7 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee,
        iwe.u.data.length = p - custom;
        if (iwe.u.data.length)
             start = iwe_stream_add_point(info, start, stop, &iwe, custom);
-#if (WIRELESS_EXT < 18)
-       if (ieee->wpa_enabled && network->wpa_ie_len){
-               char buf[MAX_WPA_IE_LEN * 2 + 30];
-       //      printk("WPA IE\n");
-               u8 *p = buf;
-               p += sprintf(p, "wpa_ie=");
-               for (i = 0; i < network->wpa_ie_len; i++) {
-                       p += sprintf(p, "%02x", network->wpa_ie[i]);
-               }
-
-               memset(&iwe, 0, sizeof(iwe));
-               iwe.cmd = IWEVCUSTOM;
-               iwe.u.data.length = strlen(buf);
-                start = iwe_stream_add_point(info, start, stop, &iwe, buf);
-        }
 
-       if (ieee->wpa_enabled && network->rsn_ie_len){
-               char buf[MAX_WPA_IE_LEN * 2 + 30];
-
-               u8 *p = buf;
-               p += sprintf(p, "rsn_ie=");
-               for (i = 0; i < network->rsn_ie_len; i++) {
-                       p += sprintf(p, "%02x", network->rsn_ie[i]);
-               }
-
-               memset(&iwe, 0, sizeof(iwe));
-               iwe.cmd = IWEVCUSTOM;
-               iwe.u.data.length = strlen(buf);
-                start = iwe_stream_add_point(info, start, stop, &iwe, buf);
-        }
-#else
        memset(&iwe, 0, sizeof(iwe));
        if (network->wpa_ie_len)
        {
@@ -260,8 +230,6 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee,
                iwe.u.data.length = network->rsn_ie_len;
                 start = iwe_stream_add_point(info, start, stop, &iwe, buf);
         }
-#endif
-
 
        /* Add EXTRA: Age to display seconds since last beacon/probe response
         * for given network. */
@@ -548,7 +516,7 @@ int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
 
        return 0;
 }
-#if (WIRELESS_EXT >= 18)
+
 int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
                                struct iw_request_info *info,
                                union iwreq_data *wrqu, char *extra)
@@ -869,7 +837,7 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee,
 
        return 0;
 }
-#endif
+
 #if 1
 int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len)
 {
@@ -919,12 +887,10 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len)
 #endif
 
 EXPORT_SYMBOL(ieee80211_wx_set_gen_ie);
-#if (WIRELESS_EXT >= 18)
 EXPORT_SYMBOL(ieee80211_wx_set_mlme);
 EXPORT_SYMBOL(ieee80211_wx_set_auth);
 EXPORT_SYMBOL(ieee80211_wx_set_encode_ext);
 EXPORT_SYMBOL(ieee80211_wx_get_encode_ext);
-#endif
 EXPORT_SYMBOL(ieee80211_wx_get_scan);
 EXPORT_SYMBOL(ieee80211_wx_set_encode);
 EXPORT_SYMBOL(ieee80211_wx_get_encode);

diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c
index d5a15bb42cbe6000573305fc0e028858b8d94229..504965a19b53f186b5a587677340b76be167afe2 100644 (file)
--- a/drivers/staging/rtl8192su/r8192U_core.c
+++ b/drivers/staging/rtl8192su/r8192U_core.c
@@ -1245,17 +1245,7 @@ static int proc_get_stats_rx(char *page, char **start,
        *eof = 1;
        return len;
 }
-#if 0
-#if WIRELESS_EXT >= 12 && WIRELESS_EXT < 17
-
-static struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
 
-       return &priv->wstats;
-}
-#endif
-#endif
 void rtl8192_proc_module_init(void)
 {
        RT_TRACE(COMP_INIT, "Initializing proc filesystem");
@@ -11874,12 +11864,8 @@ static int __devinit rtl8192_usb_probe(struct usb_interface *intf,
        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->type=ARPHRD_ETHER;
 
        dev->watchdog_timeo = HZ*3;     //modified by john, 0805

diff --git a/drivers/staging/rtl8192su/r8192U_wx.c b/drivers/staging/rtl8192su/r8192U_wx.c
index 4568312a52ac42c37baf620525005d2cd2210cf9..74aa9628265bf1475bba5c6c0219edfbfa3e3025 100644 (file)
--- a/drivers/staging/rtl8192su/r8192U_wx.c
+++ b/drivers/staging/rtl8192su/r8192U_wx.c
@@ -548,10 +548,8 @@ 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;
 }
@@ -568,7 +566,7 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
 
        if (priv->ieee80211->LinkDetectInfo.bBusyTraffic == true)
                return -EAGAIN;
-#if WIRELESS_EXT > 17
+
        if (wrqu->data.flags & IW_SCAN_THIS_ESSID)
        {
                struct iw_scan_req* req = (struct iw_scan_req*)b;
@@ -580,7 +578,6 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
                        //printk("=====>network ssid:%s\n", ieee->current_network.ssid);
                }
        }
-#endif
 
        down(&priv->wx_sem);
        if(priv->ieee80211->state != IEEE80211_LINKED){
@@ -963,7 +960,6 @@ exit:
        return err;
 }
 
-#if (WIRELESS_EXT >= 18)
 #if 0
 static int r8192_wx_get_enc_ext(struct net_device *dev,
                                         struct iw_request_info *info,
@@ -1093,7 +1089,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)
@@ -1143,11 +1139,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
         dummy,                     /* SIOCGIWAPLIST -- depricated */
         r8192_wx_set_scan,        /* SIOCSIWSCAN */
         r8192_wx_get_scan,        /* SIOCGIWSCAN */
@@ -1176,17 +1168,10 @@ static iw_handler r8192_wx_handlers[] =
        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 */
        NULL,//r8192_wx_get_enc_ext,//NULL,                     /* SIOCSIWENCODEEXT */
-#else
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-#endif
        NULL,                   /* SIOCSIWPMKSA */
        NULL,                    /*---hole---*/
 
@@ -1288,7 +1273,6 @@ static iw_handler r8192_private_handler[] = {
 #endif
 };
 
-//#if WIRELESS_EXT >= 17
 struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -1317,8 +1301,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={
        .standard = r8192_wx_handlers,
@@ -1326,8 +1308,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,
 };