Staging: vt6655: remove dependency on WIRELESS_EXT version
PATCH 1/1 Staging: vt6655: remove dependency on WIRELESS_EXT version
As the driver is in mainline now we can remove such dependencies. WIRELESS_EXT is 22 now.
Cc Forest Bond <[email protected]>
Signed-off-by Alexander Beregalov <[email protected]>
--- drivers/staging/vt6655/device.h | 4 -- drivers/staging/vt6655/device_main.c | 20 +------- drivers/staging/vt6655/hostap.h | 8 --- drivers/staging/vt6655/iwctl.c | 77 ------------------------------- drivers/staging/vt6655/iwctl.h | 83 ---------------------------------- 5 files changed, 2 insertions(+), 190 deletions(-)
drivers/staging/vt6655/device.h +0 -4
@@ -70,16 +70,12 @@#endif /* Include Wireless Extension definition and check version - Jean II */ #include <linux/wireless.h> -#if WIRELESS_EXT >12 #include <net/iw_handler.h> // New driver API -#endif /* WIRELESS_EXT > 12 */ //2008-0409-07, <Add> by Einsn Liu -#if WIRELESS_EXT >17 #ifndef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #define WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #endif -#endif //2008-4-14<add> by chester for led issue //#define FOR_LED_ON_NOTEBOOK //
drivers/staging/vt6655/device_main.c +2 -18
@@ -3412,7 +3412,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {switch (cmd) {#ifdef WIRELESS_EXT -//#if WIRELESS_EXT < 13 case SIOCGIWNAME : rc =iwctl_giwname (dev,NULL , (char *)&(wrq->u.name),NULL );
@@ -3588,7 +3587,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { }break ; -#if WIRELESS_EXT >9 // Get the current Tx-Power case SIOCGIWTXPOW :DEVICE_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " SIOCGIWTXPOW \n" );
@@ -3600,9 +3598,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { rc = -EOPNOTSUPP ;break ; -#endif // WIRELESS_EXT > 9 - -#if WIRELESS_EXT >10 case SIOCSIWRETRY : rc =iwctl_siwretry (dev,NULL , &(wrq->u.retry),NULL );
@@ -3613,8 +3608,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { rc =iwctl_giwretry (dev,NULL , &(wrq->u.retry),NULL );break ; -#endif // WIRELESS_EXT > 10 -// Get range of parameters case SIOCGIWRANGE :
@@ -3701,7 +3694,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {break ; -//#endif // WIRELESS_EXT < 13 //2008-0409-07, <Add> by Einsn Liu #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT case SIOCSIWAUTH :
@@ -3799,20 +3791,12 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {case IOCTL_CMD_HOSTAPD : -#if WIRELESS_EXT >8 - rc =hostap_ioctl (pDevice, &wrq->u.data); -#else // WIRELESS_EXT > 8 - rc =hostap_ioctl (pDevice, (struct iw_point *) &wrq->u.data); -#endif // WIRELESS_EXT > 8 + rc =hostap_ioctl (pDevice, &wrq->u.data);break ;case IOCTL_CMD_WPA : -#if WIRELESS_EXT >8 - rc =wpa_ioctl (pDevice, &wrq->u.data); -#else // WIRELESS_EXT > 8 - rc =wpa_ioctl (pDevice, (struct iw_point *) &wrq->u.data); -#endif // WIRELESS_EXT > 8 + rc =wpa_ioctl (pDevice, &wrq->u.data);break ;case SIOCETHTOOL :
drivers/staging/vt6655/hostap.h +0 -8
@@ -37,14 +37,6 @@/*--------------------- Export Definitions -------------------------*/ -#if WIRELESS_EXT <9 -struct iw_point { -caddr_t pointer; -__u16 length; -__u16 flags; -}; -#endif /* WIRELESS_EXT < 9 */ -#define WLAN_RATE_1M BIT0#define WLAN_RATE_2M BIT1#define WLAN_RATE_5M5 BIT2
drivers/staging/vt6655/iwctl.c +0 -77
233 lines not on this page · raw message
drivers/staging/vt6655/iwctl.h +0 -83
97 lines not on this page · raw message
Signature · 1 line
1.6.3.1