Skip to contentSkip to conversation

Staging: vt6656: remove dependency on WIRELESS_EXT version

PATCH In review Alexander Beregalov 2 participants 4 messages Jul 3, 2009 – Jul 6, 2009 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: vt6656: remove dependency on WIRELESS_EXT version

As the driver is in mainline now we can remove such dependency. WIRELESS_EXT is 22 now and it is always defined.

---
 drivers/staging/vt6656/device.h   |    7 ---
 drivers/staging/vt6656/hostap.h   |    8 ---
 drivers/staging/vt6656/iwctl.c    |   84 ------------------------------------
 drivers/staging/vt6656/iwctl.h    |   86 -------------------------------------
 drivers/staging/vt6656/main_usb.c |   39 +----------------
 5 files changed, 1 insertions(+), 223 deletions(-)
drivers/staging/vt6656/device.h +0 -7
index 91e2f8f..c4f9a03 100644
@@ -72,16 +72,11 @@
 #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
 
 //2007-0920-01<Add>by MikeLiu
 #ifndef SndEvt_ToAPI
@@ -910,9 +905,7 @@ typedef struct __device_info {
 #endif
     UINT                    uChannel;
 
-#ifdef WIRELESS_EXT
 	struct iw_statistics	wstats;		// wireless stats
-#endif /* WIRELESS_EXT */
     BOOL                    bCommit;
 
 } DEVICE_INFO, *PSDevice;
drivers/staging/vt6656/hostap.h +0 -8
index 1fcb2f0..c5ad349 100644
@@ -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/vt6656/iwctl.c +0 -84

242 lines not on this page · raw message

drivers/staging/vt6656/iwctl.h +0 -86

103 lines not on this page · raw message

drivers/staging/vt6656/main_usb.c +1 -38
index f94bdff..a3600c8 100644
@@ -294,7 +294,6 @@ static struct usb_device_id vntwusb_table[] = {
 
 
 
-#ifdef WIRELESS_EXT
 // Frequency list (map channels to frequencies)
 /*
 static const long frequency_list[] = {
@@ -311,15 +310,9 @@ static const long frequency_list[] = {
 #define IW_ENCODE_MODE  (IW_ENCODE_DISABLED | IW_ENCODE_RESTRICTED | IW_ENCODE_OPEN)
 #endif
 
-#if WIRELESS_EXT > 12
 static const struct iw_handler_def	iwctl_handler_def;
-#else
-struct iw_request_info {};
-#endif	//WIRELESS_EXT > 12
 */
 
-#endif /* WIRELESS_EXT */
-
 
 
 /*---------------------  Static Functions  --------------------------*/
@@ -863,14 +856,8 @@ vntwusb_found1(struct usb_interface *intf, const struct usb_device_id *id)
 
     netdev->netdev_ops         = &device_netdev_ops;
 
-#ifdef WIRELESS_EXT
-
-//2007-0508-01<Add>by MikeLiu
-
-#if WIRELESS_EXT > 12
+#ifdef CONFIG_WIRELESS_EXT
 	netdev->wireless_handlers = (struct iw_handler_def *)&iwctl_handler_def;
-//	netdev->wireless_handlers = NULL;
-#endif /* WIRELESS_EXT > 12 */
 #endif /* WIRELESS_EXT */
 
    //2008-0623-01<Remark>by MikeLiu
@@ -1752,11 +1739,8 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
     PSMgmtObject        pMgmt = &(pDevice->sMgmtObj);
     PSCmdRequest        pReq;
     //BOOL                bCommit = FALSE;
-#ifdef WIRELESS_EXT
 	struct iwreq *wrq = (struct iwreq *) rq;
 	int                 rc =0;
-#endif //WIRELESS_EXT
-
 
     if (pMgmt == NULL) {
         rc = -EFAULT;
@@ -1765,9 +1749,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);
 		break;
@@ -1946,7 +1927,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:
         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWTXPOW \n");
@@ -1958,9 +1938,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);
@@ -1971,8 +1948,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:
 
@@ -2059,8 +2034,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:
@@ -2118,8 +2091,6 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 #endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
 //End Add -- //2008-0409-07, <Add> by Einsn Liu
 
-#endif // WIRELESS_EXT
-
     case IOCTL_CMD_TEST:
 
 		if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) {
@@ -2164,11 +2135,7 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 		    rc = 0;
 		}
 
-#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
         break;
 
     case IOCTL_CMD_WPA:
@@ -2180,11 +2147,7 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 		    rc = 0;
 		}
 
-#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
         break;
 
 	case SIOCETHTOOL:
Signature · 1 line
1.6.3.3
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · On Friday 03 July 2009 12:07:14 Alexander Beregalov wrote:

As the driver is in mainline now we can remove such dependency. WIRELESS_EXT is 22 now and it is always defined.

That was fast. :)

BTW:

* It seems that both vt665x drivers should just select WIRELESS_EXT in their Kconfig's and then we can remove all remaining CONFIG_WIRELESS_EXT ifdefs.

* vt6656 probably also needs to depend on USB.

Alexander, could you look into it?

Thanks.
Bart

#2 lore raw
Quoted 7 lines

* It seems that both vt665x drivers should just select WIRELESS_EXT in their Kconfig's and then we can remove all remaining CONFIG_WIRELESS_EXT ifdefs.

* vt6656 probably also needs to depend on USB.

Alexander, could you look into it?

Like this?

Quoted 1 line

From 5dee9243562e2997a883ef994b0ebce3af6d0201 Mon Sep 17 00:00:00 2001

From: Alexander Beregalov <[email protected]>
Date: Sat, 4 Jul 2009 23:03:18 +0400
Subject: [PATCH] Staging: vt665x: depend on WIRELESS_EXT

Make vt665x depended on WIRELESS_EXT and remove remain ifdef's

---
 drivers/staging/vt6655/Kconfig       |    2 +-
 drivers/staging/vt6655/device.h      |    2 --
 drivers/staging/vt6655/device_main.c |    8 --------
 drivers/staging/vt6655/iwctl.c       |   10 ----------
 drivers/staging/vt6655/iwctl.h       |    4 ----
 drivers/staging/vt6656/Kconfig       |    1 +
 drivers/staging/vt6656/main_usb.c    |    2 --
 7 files changed, 2 insertions(+), 27 deletions(-)
drivers/staging/vt6655/Kconfig +1 -1
index a01b1e4..9bec95a 100644
@@ -1,6 +1,6 @@
 config VT6655
    tristate "VIA Technologies VT6655 support"
-   depends on PCI
+   depends on WIRELESS_EXT && PCI
    ---help---
    This is a vendor-written driver for VIA VT6655.
 
drivers/staging/vt6655/device.h +0 -2
index 6726b2c..287b141 100644
@@ -950,9 +950,7 @@ typedef struct __device_info {
     UINT                    uChannel;
     BOOL                    bMACSuspend;
 
-#ifdef WIRELESS_EXT
 	struct iw_statistics	wstats;		// wireless stats
-#endif /* WIRELESS_EXT */
     BOOL                    bCommit;
 
 } DEVICE_INFO, *PSDevice;
drivers/staging/vt6655/device_main.c +0 -8
index 8846026..8800286 100644
@@ -1146,9 +1146,7 @@ device_found1(struct pci_dev *pcid, const struct pci_device_id *ent)
     dev->irq                = pcid->irq;
     dev->netdev_ops         = &device_netdev_ops;
 
-#ifdef CONFIG_WIRELESS_EXT
 	dev->wireless_handlers = (struct iw_handler_def *)&iwctl_handler_def;
-#endif
 
     rc = register_netdev(dev);
     if (rc)
@@ -3396,10 +3394,8 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 	PSDevice	        pDevice = (PSDevice)netdev_priv(dev);
 #endif
 
-#ifdef WIRELESS_EXT
 	struct iwreq *wrq = (struct iwreq *) rq;
 	int                 rc =0;
-#endif
     PSMgmtObject        pMgmt = pDevice->pMgmt;
     PSCmdRequest        pReq;
 
@@ -3411,8 +3407,6 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 
     switch(cmd) {
 
-#ifdef WIRELESS_EXT
-
 	case SIOCGIWNAME:
 		rc = iwctl_giwname(dev, NULL, (char *)&(wrq->u.name), NULL);
 		break;
@@ -3751,8 +3745,6 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 #endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
 //End Add -- //2008-0409-07, <Add> by Einsn Liu
 
-#endif // WIRELESS_EXT
-
     case IOCTL_CMD_TEST:
 
 		if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) {
drivers/staging/vt6655/iwctl.c +0 -10
index b7c75a6..2ff8f24 100644
@@ -80,8 +80,6 @@ extern WORD TxRate_iwconfig;//2008-5-8 <add> by chester
 #define SUPPORTED_WIRELESS_EXT                  17
 #endif
 
-#ifdef WIRELESS_EXT
-
 static const long frequency_list[] = {
     2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484,
     4915, 4920, 4925, 4935, 4940, 4945, 4960, 4980,
@@ -90,8 +88,6 @@ static const long frequency_list[] = {
     5700, 5745, 5765, 5785, 5805, 5825
 	};
 
-#endif
-
 
 /*---------------------  Static Classes  ----------------------------*/
 
@@ -105,8 +101,6 @@ static int          msglevel                =MSG_LEVEL_INFO;
 
 /*---------------------  Export Variables  --------------------------*/
 
-#ifdef WIRELESS_EXT
-
 struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev)
 {
 	PSDevice pDevice = netdev_priv(dev);
@@ -2314,7 +2308,3 @@ const struct iw_handler_def	iwctl_handler_def =
 	.private	= NULL,
 	.private_args	= NULL,
 };
-
-
-
-#endif // WIRELESS_EXT
drivers/staging/vt6655/iwctl.h +0 -4
index 147af9d..44ee46c 100644
@@ -50,8 +50,6 @@ extern "C" {                            /* Assume C declarations for C++ */
 #endif /* __cplusplus */
 
 
-#ifdef WIRELESS_EXT
-
 struct iw_statistics *iwctl_get_wireless_stats (struct net_device *dev);
 
 
@@ -231,8 +229,6 @@ int iwctl_siwmlme(struct net_device *dev,
 #endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
 
 
-#endif
-
 extern const struct iw_handler_def	iwctl_handler_def;
 extern const struct iw_priv_args	iwctl_private_args;
 
drivers/staging/vt6656/Kconfig +1 -0
index f823a74..3165f2c 100644
@@ -1,5 +1,6 @@
 config VT6656
 	tristate "VIA Technologies VT6656 support"
+	depends on WIRELESS_EXT && USB
 	---help---
 	This is a vendor-written driver for VIA VT6656.
 
drivers/staging/vt6656/main_usb.c +0 -2
index a3600c8..8a6814d 100644
@@ -856,9 +856,7 @@ vntwusb_found1(struct usb_interface *intf, const struct usb_device_id *id)
 
     netdev->netdev_ops         = &device_netdev_ops;
 
-#ifdef CONFIG_WIRELESS_EXT
 	netdev->wireless_handlers = (struct iw_handler_def *)&iwctl_handler_def;
-#endif /* WIRELESS_EXT */
 
    //2008-0623-01<Remark>by MikeLiu
   //2007-0821-01<Add>by MikeLiu
Signature · 1 line
1.6.3.3
#3 lore raw
Quoted 11 lines · On Saturday 04 July 2009 21:09:32 Alexander Beregalov wrote:
Quoted 7 lines

* It seems that both vt665x drivers should just select WIRELESS_EXT in their Kconfig's and then we can remove all remaining CONFIG_WIRELESS_EXT ifdefs.

* vt6656 probably also needs to depend on USB.

Alexander, could you look into it?

Like this?

Quoted 6 lines

From 5dee9243562e2997a883ef994b0ebce3af6d0201 Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <[email protected]>
Date: Sat, 4 Jul 2009 23:03:18 +0400
Subject: [PATCH] Staging: vt665x: depend on WIRELESS_EXT

Make vt665x depended on WIRELESS_EXT and remove remain ifdef's

[ some minor typos: depended -> dependent, remain -> remaining ]

Quoted 1 line

Thanks, looks good (though "select WIRELESS_EXT" would be nicer IMHO).

I see that you've also added missing USB dependency while at it :) (it would be would worth to mention it in the patch description).

Quoted 165 lines
---
 drivers/staging/vt6655/Kconfig       |    2 +-
 drivers/staging/vt6655/device.h      |    2 --
 drivers/staging/vt6655/device_main.c |    8 --------
 drivers/staging/vt6655/iwctl.c       |   10 ----------
 drivers/staging/vt6655/iwctl.h       |    4 ----
 drivers/staging/vt6656/Kconfig       |    1 +
 drivers/staging/vt6656/main_usb.c    |    2 --
 7 files changed, 2 insertions(+), 27 deletions(-)
drivers/staging/vt6655/Kconfig +1 -1
index a01b1e4..9bec95a 100644
@@ -1,6 +1,6 @@
 config VT6655
    tristate "VIA Technologies VT6655 support"
-   depends on PCI
+   depends on WIRELESS_EXT && PCI
    ---help---
    This is a vendor-written driver for VIA VT6655.
 
drivers/staging/vt6655/device.h +0 -2
index 6726b2c..287b141 100644
@@ -950,9 +950,7 @@ typedef struct __device_info {
     UINT                    uChannel;
     BOOL                    bMACSuspend;
 
-#ifdef WIRELESS_EXT
 	struct iw_statistics	wstats;		// wireless stats
-#endif /* WIRELESS_EXT */
     BOOL                    bCommit;
 
 } DEVICE_INFO, *PSDevice;
drivers/staging/vt6655/device_main.c +0 -8
index 8846026..8800286 100644
@@ -1146,9 +1146,7 @@ device_found1(struct pci_dev *pcid, const struct pci_device_id *ent)
     dev->irq                = pcid->irq;
     dev->netdev_ops         = &device_netdev_ops;
 
-#ifdef CONFIG_WIRELESS_EXT
 	dev->wireless_handlers = (struct iw_handler_def *)&iwctl_handler_def;
-#endif
 
     rc = register_netdev(dev);
     if (rc)
@@ -3396,10 +3394,8 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 	PSDevice	        pDevice = (PSDevice)netdev_priv(dev);
 #endif
 
-#ifdef WIRELESS_EXT
 	struct iwreq *wrq = (struct iwreq *) rq;
 	int                 rc =0;
-#endif
     PSMgmtObject        pMgmt = pDevice->pMgmt;
     PSCmdRequest        pReq;
 
@@ -3411,8 +3407,6 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 
     switch(cmd) {
 
-#ifdef WIRELESS_EXT
-
 	case SIOCGIWNAME:
 		rc = iwctl_giwname(dev, NULL, (char *)&(wrq->u.name), NULL);
 		break;
@@ -3751,8 +3745,6 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 #endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
 //End Add -- //2008-0409-07, <Add> by Einsn Liu
 
-#endif // WIRELESS_EXT
-
     case IOCTL_CMD_TEST:
 
 		if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) {
drivers/staging/vt6655/iwctl.c +0 -10
index b7c75a6..2ff8f24 100644
@@ -80,8 +80,6 @@ extern WORD TxRate_iwconfig;//2008-5-8 <add> by chester
 #define SUPPORTED_WIRELESS_EXT                  17
 #endif
 
-#ifdef WIRELESS_EXT
-
 static const long frequency_list[] = {
     2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484,
     4915, 4920, 4925, 4935, 4940, 4945, 4960, 4980,
@@ -90,8 +88,6 @@ static const long frequency_list[] = {
     5700, 5745, 5765, 5785, 5805, 5825
 	};
 
-#endif
-
 
 /*---------------------  Static Classes  ----------------------------*/
 
@@ -105,8 +101,6 @@ static int          msglevel                =MSG_LEVEL_INFO;
 
 /*---------------------  Export Variables  --------------------------*/
 
-#ifdef WIRELESS_EXT
-
 struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev)
 {
 	PSDevice pDevice = netdev_priv(dev);
@@ -2314,7 +2308,3 @@ const struct iw_handler_def	iwctl_handler_def =
 	.private	= NULL,
 	.private_args	= NULL,
 };
-
-
-
-#endif // WIRELESS_EXT
drivers/staging/vt6655/iwctl.h +0 -4
index 147af9d..44ee46c 100644
@@ -50,8 +50,6 @@ extern "C" {                            /* Assume C declarations for C++ */
 #endif /* __cplusplus */
 
 
-#ifdef WIRELESS_EXT
-
 struct iw_statistics *iwctl_get_wireless_stats (struct net_device *dev);
 
 
@@ -231,8 +229,6 @@ int iwctl_siwmlme(struct net_device *dev,
 #endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
 
 
-#endif
-
 extern const struct iw_handler_def	iwctl_handler_def;
 extern const struct iw_priv_args	iwctl_private_args;
 
drivers/staging/vt6656/Kconfig +1 -0
index f823a74..3165f2c 100644
@@ -1,5 +1,6 @@
 config VT6656
 	tristate "VIA Technologies VT6656 support"
+	depends on WIRELESS_EXT && USB
 	---help---
 	This is a vendor-written driver for VIA VT6656.
 
drivers/staging/vt6656/main_usb.c +0 -2
index a3600c8..8a6814d 100644
@@ -856,9 +856,7 @@ vntwusb_found1(struct usb_interface *intf, const struct usb_device_id *id)
 
     netdev->netdev_ops         = &device_netdev_ops;
 
-#ifdef CONFIG_WIRELESS_EXT
 	netdev->wireless_handlers = (struct iw_handler_def *)&iwctl_handler_def;
-#endif /* WIRELESS_EXT */
 
    //2008-0623-01<Remark>by MikeLiu
   //2007-0821-01<Add>by MikeLiu