Skip to content

L
linux
Commit 4ab27401 authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman
Browse files
Options

staging: ks7010: remove checks for WIRELESS_EXT version 

We are by far newer than that anyhow.
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c3fe667f
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 37 deletions
drivers/staging/ks7010/ks_hostif.c
View file @ 4ab27401
...@@ -22,12 +22,7 @@ ...@@ -22,12 +22,7 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
/* Include Wireless Extension definition and check version */ /* Include Wireless Extension definition and check version */
#ifndef WIRELESS_EXT
#include <linux/wireless.h>
#endif /* WIRELESS_EXT */
#if WIRELESS_EXT > 12
#include <net/iw_handler.h> /* New driver API */ #include <net/iw_handler.h> /* New driver API */
#endif /* WIRELESS_EXT > 12 */
extern int ks_wlan_hw_tx(ks_wlan_private *priv, void *p, unsigned long size, extern int ks_wlan_hw_tx(ks_wlan_private *priv, void *p, unsigned long size,
void (*complete_handler)(void *arg1, void *arg2), void (*complete_handler)(void *arg1, void *arg2),
...@@ -121,10 +116,8 @@ static ...@@ -121,10 +116,8 @@ static
int get_current_ap(ks_wlan_private *priv, struct link_ap_info_t *ap_info) int get_current_ap(ks_wlan_private *priv, struct link_ap_info_t *ap_info)
{ {
struct local_ap_t *ap; struct local_ap_t *ap;
#if WIRELESS_EXT > 13
union iwreq_data wrqu; union iwreq_data wrqu;
struct net_device *netdev=priv->net_dev; struct net_device *netdev=priv->net_dev;
#endif /* WIRELESS_EXT > 13 */
int rc=0; int rc=0;
DPRINTK(3,"\n"); DPRINTK(3,"\n");
...@@ -190,7 +183,6 @@ int get_current_ap(ks_wlan_private *priv, struct link_ap_info_t *ap_info) ...@@ -190,7 +183,6 @@ int get_current_ap(ks_wlan_private *priv, struct link_ap_info_t *ap_info)
ap->wpa_ie.size = 0; ap->wpa_ie.size = 0;
} }
#if WIRELESS_EXT > 13
wrqu.data.length = 0; wrqu.data.length = 0;
wrqu.data.flags = 0; wrqu.data.flags = 0;
wrqu.ap_addr.sa_family = ARPHRD_ETHER; wrqu.ap_addr.sa_family = ARPHRD_ETHER;
...@@ -203,7 +195,6 @@ int get_current_ap(ks_wlan_private *priv, struct link_ap_info_t *ap_info) ...@@ -203,7 +195,6 @@ int get_current_ap(ks_wlan_private *priv, struct link_ap_info_t *ap_info)
(unsigned char)wrqu.ap_addr.sa_data[4],(unsigned char)wrqu.ap_addr.sa_data[5]); (unsigned char)wrqu.ap_addr.sa_data[4],(unsigned char)wrqu.ap_addr.sa_data[5]);
wireless_send_event(netdev, SIOCGIWAP, &wrqu, NULL); wireless_send_event(netdev, SIOCGIWAP, &wrqu, NULL);
} }
#endif
DPRINTK(4,"\n Link AP\n"); DPRINTK(4,"\n Link AP\n");
DPRINTK(4," bssid=%02X:%02X:%02X:%02X:%02X:%02X\n \ DPRINTK(4," bssid=%02X:%02X:%02X:%02X:%02X:%02X\n \
essid=%s\n rate_set=%02X,%02X,%02X,%02X,%02X,%02X,%02X,%02X\n channel=%d\n \ essid=%s\n rate_set=%02X,%02X,%02X,%02X,%02X,%02X,%02X,%02X\n channel=%d\n \
...@@ -338,9 +329,7 @@ void hostif_data_indication(ks_wlan_private *priv) ...@@ -338,9 +329,7 @@ void hostif_data_indication(ks_wlan_private *priv)
struct ieee802_1x_hdr *aa1x_hdr; struct ieee802_1x_hdr *aa1x_hdr;
struct wpa_eapol_key *eap_key; struct wpa_eapol_key *eap_key;
struct michel_mic_t michel_mic; struct michel_mic_t michel_mic;
#if WIRELESS_EXT > 14
union iwreq_data wrqu; union iwreq_data wrqu;
#endif /* WIRELESS_EXT > 14 */
DPRINTK(3,"\n"); DPRINTK(3,"\n");
...@@ -412,7 +401,6 @@ void hostif_data_indication(ks_wlan_private *priv) ...@@ -412,7 +401,6 @@ void hostif_data_indication(ks_wlan_private *priv)
mic_failure->counter = 1; mic_failure->counter = 1;
} }
priv->wpa.mic_failure.last_failure_time = now; priv->wpa.mic_failure.last_failure_time = now;
#if WIRELESS_EXT > 14
/* needed parameters: count, keyid, key type, TSC */ /* needed parameters: count, keyid, key type, TSC */
sprintf(buf, "MLME-MICHAELMICFAILURE.indication(keyid=%d %scast addr=" sprintf(buf, "MLME-MICHAELMICFAILURE.indication(keyid=%d %scast addr="
"%02x:%02x:%02x:%02x:%02x:%02x)", "%02x:%02x:%02x:%02x:%02x:%02x)",
...@@ -424,7 +412,6 @@ void hostif_data_indication(ks_wlan_private *priv) ...@@ -424,7 +412,6 @@ void hostif_data_indication(ks_wlan_private *priv)
wrqu.data.length = strlen(buf); wrqu.data.length = strlen(buf);
DPRINTK(4,"IWEVENT:MICHAELMICFAILURE\n"); DPRINTK(4,"IWEVENT:MICHAELMICFAILURE\n");
wireless_send_event(priv->net_dev, IWEVCUSTOM, &wrqu, buf); wireless_send_event(priv->net_dev, IWEVCUSTOM, &wrqu, buf);
#endif /* WIRELESS_EXT > 14 */
return; return;
} }
} }
...@@ -754,9 +741,7 @@ void hostif_connect_indication(ks_wlan_private *priv) ...@@ -754,9 +741,7 @@ void hostif_connect_indication(ks_wlan_private *priv)
unsigned int tmp=0; unsigned int tmp=0;
unsigned int old_status=priv->connect_status; unsigned int old_status=priv->connect_status;
struct net_device *netdev=priv->net_dev; struct net_device *netdev=priv->net_dev;
#if WIRELESS_EXT > 13
union iwreq_data wrqu0; union iwreq_data wrqu0;
#endif /* WIRELESS_EXT > 13 */
connect_code = get_WORD(priv); connect_code = get_WORD(priv);
switch(connect_code){ switch(connect_code){
...@@ -791,7 +776,6 @@ void hostif_connect_indication(ks_wlan_private *priv) ...@@ -791,7 +776,6 @@ void hostif_connect_indication(ks_wlan_private *priv)
} }
ks_wlan_do_power_save(priv); ks_wlan_do_power_save(priv);
#if WIRELESS_EXT > 13
wrqu0.data.length = 0; wrqu0.data.length = 0;
wrqu0.data.flags = 0; wrqu0.data.flags = 0;
wrqu0.ap_addr.sa_family = ARPHRD_ETHER; wrqu0.ap_addr.sa_family = ARPHRD_ETHER;
...@@ -802,7 +786,6 @@ void hostif_connect_indication(ks_wlan_private *priv) ...@@ -802,7 +786,6 @@ void hostif_connect_indication(ks_wlan_private *priv)
DPRINTK(3,"disconnect :: scan_ind_count=%d\n",priv->scan_ind_count); DPRINTK(3,"disconnect :: scan_ind_count=%d\n",priv->scan_ind_count);
wireless_send_event(netdev, SIOCGIWAP, &wrqu0, NULL); wireless_send_event(netdev, SIOCGIWAP, &wrqu0, NULL);
} }
#endif /* WIRELESS_EXT > 13 */
priv->scan_ind_count=0; priv->scan_ind_count=0;
} }
...@@ -904,7 +887,6 @@ void hostif_adhoc_set_confirm(ks_wlan_private *priv) ...@@ -904,7 +887,6 @@ void hostif_adhoc_set_confirm(ks_wlan_private *priv)
static static
void hostif_associate_indication(ks_wlan_private *priv) void hostif_associate_indication(ks_wlan_private *priv)
{ {
#if WIRELESS_EXT > 14
struct association_request_t *assoc_req; struct association_request_t *assoc_req;
struct association_response_t *assoc_resp; struct association_response_t *assoc_resp;
unsigned char *pb; unsigned char *pb;
...@@ -944,29 +926,24 @@ void hostif_associate_indication(ks_wlan_private *priv) ...@@ -944,29 +926,24 @@ void hostif_associate_indication(ks_wlan_private *priv)
DPRINTK(3,"IWEVENT:ASSOCINFO\n"); DPRINTK(3,"IWEVENT:ASSOCINFO\n");
wireless_send_event(priv->net_dev, IWEVCUSTOM, &wrqu, buf); wireless_send_event(priv->net_dev, IWEVCUSTOM, &wrqu, buf);
#endif /* WIRELESS_EXT > 14 */
} }
static static
void hostif_bss_scan_confirm(ks_wlan_private *priv) void hostif_bss_scan_confirm(ks_wlan_private *priv)
{ {
unsigned int result_code; unsigned int result_code;
#if WIRELESS_EXT > 13
struct net_device *dev = priv->net_dev; struct net_device *dev = priv->net_dev;
union iwreq_data wrqu; union iwreq_data wrqu;
#endif /* WIRELESS_EXT > 13 */
result_code = get_DWORD(priv); result_code = get_DWORD(priv);
DPRINTK(2,"result=%d :: scan_ind_count=%d\n", result_code, priv->scan_ind_count); DPRINTK(2,"result=%d :: scan_ind_count=%d\n", result_code, priv->scan_ind_count);
priv->sme_i.sme_flag &= ~SME_AP_SCAN; priv->sme_i.sme_flag &= ~SME_AP_SCAN;
hostif_sme_enqueue(priv, SME_BSS_SCAN_CONFIRM); hostif_sme_enqueue(priv, SME_BSS_SCAN_CONFIRM);
#if WIRELESS_EXT > 13
wrqu.data.length = 0; wrqu.data.length = 0;
wrqu.data.flags = 0; wrqu.data.flags = 0;
DPRINTK(3,"IWEVENT: SCAN CONFIRM\n"); DPRINTK(3,"IWEVENT: SCAN CONFIRM\n");
wireless_send_event(dev, SIOCGIWSCAN, &wrqu, NULL); wireless_send_event(dev, SIOCGIWSCAN, &wrqu, NULL);
#endif /* WIRELESS_EXT > 13 */
priv->scan_ind_count=0; priv->scan_ind_count=0;
} }
......
drivers/staging/ks7010/ks_wlan_net.c
View file @ 4ab27401
...@@ -50,7 +50,6 @@ static int wep_on_off; ...@@ -50,7 +50,6 @@ static int wep_on_off;
#define WIRELESS_SPY /* enable iwspy support */ #define WIRELESS_SPY /* enable iwspy support */
#include <net/iw_handler.h> /* New driver API */ #include <net/iw_handler.h> /* New driver API */
#ifdef WIRELESS_EXT
/* Frequency list (map channels to frequencies) */ /* Frequency list (map channels to frequencies) */
static const long frequency_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442, static const long frequency_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
2447, 2452, 2457, 2462, 2467, 2472, 2484 }; 2447, 2452, 2457, 2462, 2467, 2472, 2484 };
...@@ -74,7 +73,6 @@ static const struct iw_handler_def ks_wlan_handler_def; ...@@ -74,7 +73,6 @@ static const struct iw_handler_def ks_wlan_handler_def;
#define KSC_OPNOTSUPP /* Operation Not Support*/ #define KSC_OPNOTSUPP /* Operation Not Support*/
#endif /* WIRELESS_EXT */
/* /*
* function prototypes * function prototypes
...@@ -174,7 +172,6 @@ int ks_wlan_setup_parameter(ks_wlan_private *priv, unsigned int commit_flag) ...@@ -174,7 +172,6 @@ int ks_wlan_setup_parameter(ks_wlan_private *priv, unsigned int commit_flag)
return 0; return 0;
} }
#ifdef WIRELESS_EXT
/* /*
* Initial Wireless Extension code for Ks_Wlannet driver by : * Initial Wireless Extension code for Ks_Wlannet driver by :
* Jean Tourrilhes <jt@hpl.hp.com> - HPL - 17 November 00 * Jean Tourrilhes <jt@hpl.hp.com> - HPL - 17 November 00
...@@ -1090,7 +1087,6 @@ static int ks_wlan_get_range(struct net_device *dev, struct iw_request_info *inf ...@@ -1090,7 +1087,6 @@ static int ks_wlan_get_range(struct net_device *dev, struct iw_request_info *inf
range->avg_qual.level = 186; /* -70 dBm */ range->avg_qual.level = 186; /* -70 dBm */
range->avg_qual.noise = 0; range->avg_qual.noise = 0;
#if defined(WIRELESS_EXT)
/* Event capability (kernel + driver) */ /* Event capability (kernel + driver) */
range->event_capa[0] = (IW_EVENT_CAPA_K_0 | range->event_capa[0] = (IW_EVENT_CAPA_K_0 |
IW_EVENT_CAPA_MASK(SIOCGIWAP) | IW_EVENT_CAPA_MASK(SIOCGIWAP) |
...@@ -1104,7 +1100,6 @@ static int ks_wlan_get_range(struct net_device *dev, struct iw_request_info *inf ...@@ -1104,7 +1100,6 @@ static int ks_wlan_get_range(struct net_device *dev, struct iw_request_info *inf
IW_ENC_CAPA_WPA2 | IW_ENC_CAPA_WPA2 |
IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_TKIP |
IW_ENC_CAPA_CIPHER_CCMP); IW_ENC_CAPA_CIPHER_CCMP);
#endif
return 0; return 0;
} }
...@@ -1229,7 +1224,6 @@ static int ks_wlan_get_aplist(struct net_device *dev, struct iw_request_info *in ...@@ -1229,7 +1224,6 @@ static int ks_wlan_get_aplist(struct net_device *dev, struct iw_request_info *in
return 0; return 0;
} }
#if defined(WIRELESS_EXT)
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Wireless Handler : Initiate Scan */ /* Wireless Handler : Initiate Scan */
static int ks_wlan_set_scan(struct net_device *dev, struct iw_request_info *info, static int ks_wlan_set_scan(struct net_device *dev, struct iw_request_info *info,
...@@ -1452,7 +1446,6 @@ DPRINTK(2,"aplist 0\n"); ...@@ -1452,7 +1446,6 @@ DPRINTK(2,"aplist 0\n");
return 0; return 0;
} }
#endif /* WIRELESS_EXT */
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Commit handler : called after a bunch of SET operations */ /* Commit handler : called after a bunch of SET operations */
...@@ -1469,7 +1462,6 @@ static int ks_wlan_config_commit(struct net_device *dev, struct iw_request_info ...@@ -1469,7 +1462,6 @@ static int ks_wlan_config_commit(struct net_device *dev, struct iw_request_info
return 0; return 0;
} }
#ifdef WIRELESS_EXT
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Wireless handler : set association ie params */ /* Wireless handler : set association ie params */
static int ks_wlan_set_genie(struct net_device *dev, struct iw_request_info *info, static int ks_wlan_set_genie(struct net_device *dev, struct iw_request_info *info,
...@@ -1951,7 +1943,6 @@ static int ks_wlan_set_mlme(struct net_device *dev, struct iw_request_info *info ...@@ -1951,7 +1943,6 @@ static int ks_wlan_set_mlme(struct net_device *dev, struct iw_request_info *info
return -EOPNOTSUPP; /* Not Support */ return -EOPNOTSUPP; /* Not Support */
} }
} }
#endif /* WIRELESS_EXT */
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Private handler : get driver version */ /* Private handler : get driver version */
...@@ -2915,20 +2906,15 @@ static const struct iw_handler_def ks_wlan_handler_def = ...@@ -2915,20 +2906,15 @@ static const struct iw_handler_def ks_wlan_handler_def =
.get_wireless_stats = ks_get_wireless_stats, .get_wireless_stats = ks_get_wireless_stats,
}; };
#endif /* WIRELESS_EXT */
static int ks_wlan_netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int ks_wlan_netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
int rc = 0; int rc = 0;
#if defined(WIRELESS_EXT)
struct iwreq *wrq = (struct iwreq *) rq; struct iwreq *wrq = (struct iwreq *) rq;
#endif /* WIRELESS_EXT */
switch (cmd) { switch (cmd) {
#if defined(WIRELESS_EXT)
case SIOCIWFIRSTPRIV+20: /* KS_WLAN_SET_STOP_REQ */ case SIOCIWFIRSTPRIV+20: /* KS_WLAN_SET_STOP_REQ */
rc = ks_wlan_set_stop_request(dev, NULL, &(wrq->u.mode), NULL); rc = ks_wlan_set_stop_request(dev, NULL, &(wrq->u.mode), NULL);
break; break;
#endif /* WIRELESS_EXT >17 */
// All other calls are currently unsupported // All other calls are currently unsupported
default: default:
rc = -EOPNOTSUPP; rc = -EOPNOTSUPP;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7