From bcf580e198ca20d610aba456f1d4bfcf4d8002f8 Mon Sep 17 00:00:00 2001
From: Marcos Paulo de Souza <marcos.mage@gmail.com>
Date: Wed, 28 Dec 2011 21:13:39 +0000
Subject: [PATCH] --- yaml --- r: 288987 b: refs/heads/master c:
 739ea07640f4dd3cc440b836ad6a88388c2dcf28 h: refs/heads/master i:   288985:
 724f08a8456c744222fe9239d8924e9757f03fce   288983:
 57c922146a6a0ba4fdbd6d5a15c479c7a0577b5b v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/vt6656/iwctl.c    | 6 +-----
 trunk/drivers/staging/vt6656/iwctl.h    | 2 +-
 trunk/drivers/staging/vt6656/main_usb.c | 3 +--
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index dcd93f73e295..539e5645cf17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caa20de81635b567ee0114a81ffbbffb3085d727
+refs/heads/master: 739ea07640f4dd3cc440b836ad6a88388c2dcf28
diff --git a/trunk/drivers/staging/vt6656/iwctl.c b/trunk/drivers/staging/vt6656/iwctl.c
index d6c969a65cf8..4f33b0c0812a 100644
--- a/trunk/drivers/staging/vt6656/iwctl.c
+++ b/trunk/drivers/staging/vt6656/iwctl.c
@@ -965,8 +965,7 @@ int iwctl_siwrate(struct net_device *dev,
 /*
  * Wireless Handler : get data rate
  */
-
-int iwctl_giwrate(struct net_device *dev,
+void iwctl_giwrate(struct net_device *dev,
              struct iw_request_info *info,
              struct iw_param *wrq,
              char *extra)
@@ -1004,9 +1003,6 @@ int iwctl_giwrate(struct net_device *dev,
 	    if (pDevice->bFixRate == TRUE)
 	        wrq->fixed = TRUE;
     }
-
-
-	return 0;
 }
 
 
diff --git a/trunk/drivers/staging/vt6656/iwctl.h b/trunk/drivers/staging/vt6656/iwctl.h
index 0bab0d755c5e..bd38e9dc6f33 100644
--- a/trunk/drivers/staging/vt6656/iwctl.h
+++ b/trunk/drivers/staging/vt6656/iwctl.h
@@ -107,7 +107,7 @@ int iwctl_siwrate(struct net_device *dev,
 			 struct iw_param *wrq,
              char *extra);
 
-int iwctl_giwrate(struct net_device *dev,
+void iwctl_giwrate(struct net_device *dev,
              struct iw_request_info *info,
              struct iw_param *wrq,
              char *extra);
diff --git a/trunk/drivers/staging/vt6656/main_usb.c b/trunk/drivers/staging/vt6656/main_usb.c
index 91b953cb6d36..33a451c6ac18 100644
--- a/trunk/drivers/staging/vt6656/main_usb.c
+++ b/trunk/drivers/staging/vt6656/main_usb.c
@@ -1698,8 +1698,7 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 
 	// Get the current bit-rate
 	case SIOCGIWRATE:
-
-		rc = iwctl_giwrate(dev, NULL, &(wrq->u.bitrate), NULL);
+		iwctl_giwrate(dev, NULL, &(wrq->u.bitrate), NULL);
 		break;
 
 	// Set the desired RTS threshold