OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging:vt6656: iwctl.c: Removed unneeded function 

Removed the function iwctl_giwnwid, that just return a error code.

Changes v1 to v2:
	Removed same functions of vt6655 and vt6656.

Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Marcos Paulo de Souza 2011-11-28 19:16:37 +00:00 committed by Greg Kroah-Hartman
parent 95fa0405c5
commit 428c1fb50e
6 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/vt6655/device_main.c
View File

@ -3153,11 +3153,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
break;
case SIOCGIWNWID: //0x8b03 support
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
rc = iwctl_giwnwid(dev, NULL, &(wrq->u.nwid), NULL);
#else
rc = -EOPNOTSUPP;
#endif
rc = -EOPNOTSUPP;
break;
// Set frequency/channel

12
drivers/staging/vt6655/iwctl.c
View File

@ -151,18 +151,6 @@ int iwctl_giwname(struct net_device *dev,
return 0;
}
int iwctl_giwnwid(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *wrq,
char *extra)
{
//wrq->value = 0x100;
//wrq->disabled = 0;
//wrq->fixed = 1;
//return 0;
return -EOPNOTSUPP;
}
/*
* Wireless Handler : set scan
*/

5
drivers/staging/vt6655/iwctl.h
View File

@ -79,11 +79,6 @@ int iwctl_giwname(struct net_device *dev,
char *wrq,
char *extra);
int iwctl_giwnwid(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *wrq,
char *extra) ;
int iwctl_giwsens(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *wrq,

12
drivers/staging/vt6656/iwctl.c
View File

@ -128,17 +128,6 @@ int iwctl_giwname(struct net_device *dev,
return 0;
}
int iwctl_giwnwid(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *wrq,
char *extra)
{
//wrq->value = 0x100;
//wrq->disabled = 0;
//wrq->fixed = 1;
//return 0;
return -EOPNOTSUPP;
}
/*
* Wireless Handler : set scan
*/
@ -1939,7 +1928,6 @@ static const iw_handler iwctl_handler[] =
(iw_handler) iwctl_commit, // SIOCSIWCOMMIT
(iw_handler) iwctl_giwname, // SIOCGIWNAME
(iw_handler) NULL, // SIOCSIWNWID
(iw_handler) NULL, // SIOCGIWNWID
(iw_handler) iwctl_siwfreq, // SIOCSIWFREQ
(iw_handler) iwctl_giwfreq, // SIOCGIWFREQ
(iw_handler) iwctl_siwmode, // SIOCSIWMODE

5
drivers/staging/vt6656/iwctl.h
View File

@ -77,11 +77,6 @@ int iwctl_giwname(struct net_device *dev,
char *wrq,
char *extra);
int iwctl_giwnwid(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *wrq,
char *extra) ;
int iwctl_giwsens(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *wrq,

9
drivers/staging/vt6656/main_usb.c
View File

@ -1618,15 +1618,8 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
break;
case SIOCSIWNWID:
rc = -EOPNOTSUPP;
break;
case SIOCGIWNWID: //0x8b03 support
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
rc = iwctl_giwnwid(dev, NULL, &(wrq->u.nwid), NULL);
#else
rc = -EOPNOTSUPP;
#endif
rc = -EOPNOTSUPP;
break;
// Set frequency/channel