From 724f08a8456c744222fe9239d8924e9757f03fce Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Wed, 28 Dec 2011 21:10:50 +0000 Subject: [PATCH] --- yaml --- r: 288985 b: refs/heads/master c: f9b9f93426139e7525306b94df8f82989c3f6138 h: refs/heads/master i: 288983: 57c922146a6a0ba4fdbd6d5a15c479c7a0577b5b v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6656/iwctl.c | 5 +---- trunk/drivers/staging/vt6656/iwctl.h | 2 +- trunk/drivers/staging/vt6656/main_usb.c | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f9fbfb45a959..1f6e0767e278 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d11b1737d52b6f9428c2daea72457cd477e0122 +refs/heads/master: f9b9f93426139e7525306b94df8f82989c3f6138 diff --git a/trunk/drivers/staging/vt6656/iwctl.c b/trunk/drivers/staging/vt6656/iwctl.c index 75b36d3bf1ae..0e27fb1d9640 100644 --- a/trunk/drivers/staging/vt6656/iwctl.c +++ b/trunk/drivers/staging/vt6656/iwctl.c @@ -505,7 +505,7 @@ void iwctl_giwmode(struct net_device *dev, * Wireless Handler : get capability range */ -int iwctl_giwrange(struct net_device *dev, +void iwctl_giwrange(struct net_device *dev, struct iw_request_info *info, struct iw_point *wrq, char *extra) @@ -600,9 +600,6 @@ int iwctl_giwrange(struct net_device *dev, range->avg_qual.level = 176; // -80 dBm range->avg_qual.noise = 0; } - - - return 0; } diff --git a/trunk/drivers/staging/vt6656/iwctl.h b/trunk/drivers/staging/vt6656/iwctl.h index 60180a75f30d..22acf8be8e7c 100644 --- a/trunk/drivers/staging/vt6656/iwctl.h +++ b/trunk/drivers/staging/vt6656/iwctl.h @@ -46,7 +46,7 @@ int iwctl_siwap(struct net_device *dev, struct sockaddr *wrq, char *extra); -int iwctl_giwrange(struct net_device *dev, +void iwctl_giwrange(struct net_device *dev, struct iw_request_info *info, struct iw_point *wrq, char *extra); diff --git a/trunk/drivers/staging/vt6656/main_usb.c b/trunk/drivers/staging/vt6656/main_usb.c index fdd35c6af1c0..6213075030dc 100644 --- a/trunk/drivers/staging/vt6656/main_usb.c +++ b/trunk/drivers/staging/vt6656/main_usb.c @@ -1811,7 +1811,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { { struct iw_range range; - rc = iwctl_giwrange(dev, NULL, &(wrq->u.data), (char *) &range); + iwctl_giwrange(dev, NULL, &(wrq->u.data), (char *) &range); if (copy_to_user(wrq->u.data.pointer, &range, sizeof(struct iw_range))) rc = -EFAULT; }