Commit 428c1fb5 authored by Marcos Paulo de Souza's avatar Marcos Paulo de Souza Committed by Greg Kroah-Hartman

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: default avatarMarcos Paulo de Souza <marcos.mage@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 95fa0405
...@@ -3153,11 +3153,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { ...@@ -3153,11 +3153,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
break; break;
case SIOCGIWNWID: //0x8b03 support case SIOCGIWNWID: //0x8b03 support
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT rc = -EOPNOTSUPP;
rc = iwctl_giwnwid(dev, NULL, &(wrq->u.nwid), NULL);
#else
rc = -EOPNOTSUPP;
#endif
break; break;
// Set frequency/channel // Set frequency/channel
......
...@@ -151,18 +151,6 @@ int iwctl_giwname(struct net_device *dev, ...@@ -151,18 +151,6 @@ int iwctl_giwname(struct net_device *dev,
return 0; 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 * Wireless Handler : set scan
*/ */
......
...@@ -79,11 +79,6 @@ int iwctl_giwname(struct net_device *dev, ...@@ -79,11 +79,6 @@ int iwctl_giwname(struct net_device *dev,
char *wrq, char *wrq,
char *extra); 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, int iwctl_giwsens(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
struct iw_param *wrq, struct iw_param *wrq,
......
...@@ -128,17 +128,6 @@ int iwctl_giwname(struct net_device *dev, ...@@ -128,17 +128,6 @@ int iwctl_giwname(struct net_device *dev,
return 0; 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 * Wireless Handler : set scan
*/ */
...@@ -1939,7 +1928,6 @@ static const iw_handler iwctl_handler[] = ...@@ -1939,7 +1928,6 @@ static const iw_handler iwctl_handler[] =
(iw_handler) iwctl_commit, // SIOCSIWCOMMIT (iw_handler) iwctl_commit, // SIOCSIWCOMMIT
(iw_handler) iwctl_giwname, // SIOCGIWNAME (iw_handler) iwctl_giwname, // SIOCGIWNAME
(iw_handler) NULL, // SIOCSIWNWID (iw_handler) NULL, // SIOCSIWNWID
(iw_handler) NULL, // SIOCGIWNWID
(iw_handler) iwctl_siwfreq, // SIOCSIWFREQ (iw_handler) iwctl_siwfreq, // SIOCSIWFREQ
(iw_handler) iwctl_giwfreq, // SIOCGIWFREQ (iw_handler) iwctl_giwfreq, // SIOCGIWFREQ
(iw_handler) iwctl_siwmode, // SIOCSIWMODE (iw_handler) iwctl_siwmode, // SIOCSIWMODE
......
...@@ -77,11 +77,6 @@ int iwctl_giwname(struct net_device *dev, ...@@ -77,11 +77,6 @@ int iwctl_giwname(struct net_device *dev,
char *wrq, char *wrq,
char *extra); 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, int iwctl_giwsens(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
struct iw_param *wrq, struct iw_param *wrq,
......
...@@ -1618,15 +1618,8 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { ...@@ -1618,15 +1618,8 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
break; break;
case SIOCSIWNWID: case SIOCSIWNWID:
rc = -EOPNOTSUPP;
break;
case SIOCGIWNWID: //0x8b03 support case SIOCGIWNWID: //0x8b03 support
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT rc = -EOPNOTSUPP;
rc = iwctl_giwnwid(dev, NULL, &(wrq->u.nwid), NULL);
#else
rc = -EOPNOTSUPP;
#endif
break; break;
// Set frequency/channel // Set frequency/channel
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment