leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: vt6656: iwctl.c: Rewrite siwrts funciton

Browse Source 
This function has the following issues:
	Parameter info and extra are not used
	Wrong error handling(the function not return -EINVAL when it
happens)

This patch simplifies this funtion, remove the not used parameters and
fix the error handilng.

Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Marcos Paulo de Souza 2011-12-28 21:18:31 +00:00 committed by Greg Kroah-Hartman
parent 739ea07640
commit 2fdde902ca
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1010,27 +1010,19 @@ void iwctl_giwrate(struct net_device *dev,
/*
* Wireless Handler : set rts threshold
*/
int iwctl_siwrts(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *wrq,
char *extra)
struct iw_param *wrq)
{
PSDevice pDevice = (PSDevice)netdev_priv(dev);
int rc = 0;
PSDevice pDevice = (PSDevice)netdev_priv(dev);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWRTS \n");
if ((wrq->value < 0 || wrq->value > 2312) && !wrq->disabled)
return -EINVAL;
{
int rthr = wrq->value;
if(wrq->disabled)
rthr = 2312;
if((rthr < 0) || (rthr > 2312)) {
rc = -EINVAL;
}else {
pDevice->wRTSThreshold = rthr;
}
}
else if (wrq->disabled)
pDevice->wRTSThreshold = 2312;
else
pDevice->wRTSThreshold = wrq->value;
return 0;
}

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

@ -113,10 +113,7 @@ void iwctl_giwrate(struct net_device *dev,
char *extra);
int iwctl_siwrts(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *wrq,
char *extra);
struct iw_param *wrq);
int iwctl_giwrts(struct net_device *dev,
struct iw_request_info *info,

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

@ -1704,7 +1704,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
// Set the desired RTS threshold
case SIOCSIWRTS:
rc = iwctl_siwrts(dev, NULL, &(wrq->u.rts), NULL);
rc = iwctl_siwrts(dev, &(wrq->u.rts));
break;
// Get the current RTS threshold