Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e882335b authored by Alexander Beregalov's avatar Alexander Beregalov Committed by Greg Kroah-Hartman
Browse files

Staging: vt665x: depend on WIRELESS_EXT 



Make vt665x depended on WIRELESS_EXT and remove remain ifdef's

Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 70f38b10

drivers/staging/vt6655/Kconfig

+1 −1
Original line number Diff line number Diff line 
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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;