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

Commit 516a4f04 authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman
Browse files

staging: ks7010: drop private handler for driver version 



We are upstream now, we don't need seperate driver versioning.

Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6634cff1

drivers/staging/ks7010/ks7010_sdio.h

+0 −1
Original line number Diff line number Diff line
@@ -143,6 +143,5 @@ struct rx_device { 
	spinlock_t rx_dev_lock;

};

#define	ROM_FILE "ks7010sd.rom"

#define	KS_WLAN_DRIVER_VERSION_INFO  "ks7010 sdio linux 007"



#endif /* _KS7010_SDIO_H */

drivers/staging/ks7010/ks_wlan_ioctl.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
/* The low order bit identify a SET (0) or a GET (1) ioctl.  */



/*					SIOCIWFIRSTPRIV+0 */

#define KS_WLAN_GET_DRIVER_VERSION	SIOCIWFIRSTPRIV+1

/* former KS_WLAN_GET_DRIVER_VERSION	SIOCIWFIRSTPRIV+1 */

/*					SIOCIWFIRSTPRIV+2 */

#define KS_WLAN_GET_FIRM_VERSION	SIOCIWFIRSTPRIV+3

#ifdef WPS

drivers/staging/ks7010/ks_wlan_net.c

+1 −14
Original line number Diff line number Diff line
@@ -2198,17 +2198,6 @@ static int ks_wlan_set_mlme(struct net_device *dev, 
	}

}



/*------------------------------------------------------------------*/

/* Private handler : get driver version */

static int ks_wlan_get_driver_version(struct net_device *dev,

				      struct iw_request_info *info,

				      struct iw_point *dwrq, char *extra)

{

	strcpy(extra, KS_WLAN_DRIVER_VERSION_INFO);

	dwrq->length = strlen(KS_WLAN_DRIVER_VERSION_INFO) + 1;

	return 0;

}



/*------------------------------------------------------------------*/

/* Private handler : get firemware version */

static int ks_wlan_get_firmware_version(struct net_device *dev,
@@ -3128,8 +3117,6 @@ static int ks_wlan_hostt(struct net_device *dev, struct iw_request_info *info, 


static const struct iw_priv_args ks_wlan_private_args[] = {

/*{ cmd, set_args, get_args, name[16] } */

	{KS_WLAN_GET_DRIVER_VERSION, IW_PRIV_TYPE_NONE,

	 IW_PRIV_TYPE_CHAR | (128 + 1), "GetDriverVer"},

	{KS_WLAN_GET_FIRM_VERSION, IW_PRIV_TYPE_NONE,

	 IW_PRIV_TYPE_CHAR | (128 + 1), "GetFirmwareVer"},

#ifdef WPS
@@ -3258,7 +3245,7 @@ static const iw_handler ks_wlan_handler[] = { 
/* private_handler */

static const iw_handler ks_wlan_private_handler[] = {

	(iw_handler) NULL,	/*  0 */

	(iw_handler) ks_wlan_get_driver_version,	/*  1 KS_WLAN_GET_DRIVER_VERSION */

	(iw_handler) NULL,	/*  1, used to be: KS_WLAN_GET_DRIVER_VERSION */

	(iw_handler) NULL,	/*  2 */

	(iw_handler) ks_wlan_get_firmware_version,	/*  3 KS_WLAN_GET_FIRM_VERSION */

#ifdef WPS