staging: vt6656: iwctl.c: Rewrite siwrts funciton
PATCH 7/7 staging: vt6656: iwctl.c: Rewrite siwrts funciton
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 <[email protected]>
--- drivers/staging/vt6656/iwctl.c | 26 +++++++++----------------- drivers/staging/vt6656/iwctl.h | 5 +---- drivers/staging/vt6656/main_usb.c | 2 +- 3 files changed, 11 insertions(+), 22 deletions(-)
drivers/staging/vt6656/iwctl.c +9 -17
@@ -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); + +if ((wrq->value <0 || wrq->value >2312 ) && !wrq->disabled) +return -EINVAL ; -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " SIOCSIWRTS \n" ); +else if (wrq->disabled) + pDevice->wRTSThreshold =2312 ; - { -int rthr = wrq->value; -if (wrq->disabled) - rthr =2312 ; -if ((rthr <0 ) || (rthr >2312 )) { - rc = -EINVAL ; - }else { - pDevice->wRTSThreshold = rthr; - } - } +else + pDevice->wRTSThreshold = wrq->value;return 0 ; }
drivers/staging/vt6656/iwctl.h +1 -4
@@ -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,
drivers/staging/vt6656/main_usb.c +1 -1
@@ -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
Signature · 1 line
1.7.4.4