* [PATCH RESEND] drivers/staging/vt6656/iwctl.c: Remove unnecessary function
@ 2011-11-24 19:09 Marcos Paulo de Souza
2011-11-27 1:55 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Marcos Paulo de Souza @ 2011-11-24 19:09 UTC (permalink / raw)
To: devel; +Cc: forest, greg, linux-kernel, Marcos Paulo de Souza
Removed the function iwctl_giwnwid, that was used once. Removed too a
switch/case statement that was ambiguous.
Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
---
drivers/staging/vt6656/iwctl.c | 11 -----------
drivers/staging/vt6656/iwctl.h | 5 -----
drivers/staging/vt6656/main_usb.c | 9 +--------
3 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 8c1ca49..a9110bf 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -127,17 +127,6 @@ int iwctl_giwname(struct net_device *dev,
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
*/
diff --git a/drivers/staging/vt6656/iwctl.h b/drivers/staging/vt6656/iwctl.h
index cc48954..10a240e 100644
--- a/drivers/staging/vt6656/iwctl.h
+++ b/drivers/staging/vt6656/iwctl.h
@@ -77,11 +77,6 @@ int iwctl_giwname(struct net_device *dev,
char *wrq,
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,
struct iw_request_info *info,
struct iw_param *wrq,
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 27521b6..6f9930a 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -1618,15 +1618,8 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
break;
case SIOCSIWNWID:
- rc = -EOPNOTSUPP;
- break;
-
case SIOCGIWNWID: //0x8b03 support
- #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
- rc = iwctl_giwnwid(dev, NULL, &(wrq->u.nwid), NULL);
- #else
- rc = -EOPNOTSUPP;
- #endif
+ rc = -EOPNOTSUPP;
break;
// Set frequency/channel
--
1.7.4.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH RESEND] drivers/staging/vt6656/iwctl.c: Remove unnecessary function
2011-11-24 19:09 [PATCH RESEND] drivers/staging/vt6656/iwctl.c: Remove unnecessary function Marcos Paulo de Souza
@ 2011-11-27 1:55 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2011-11-27 1:55 UTC (permalink / raw)
To: Marcos Paulo de Souza; +Cc: devel, greg, forest, linux-kernel
On Thu, Nov 24, 2011 at 07:09:40PM +0000, Marcos Paulo de Souza wrote:
> Removed the function iwctl_giwnwid, that was used once. Removed too a
> switch/case statement that was ambiguous.
You've sent a bunch of vt66* patches recently, could you handle all of
the review comments that I've made, and resend all of them, so I can
properly apply them, as I don't know which ones depend on which.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-27 9:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-24 19:09 [PATCH RESEND] drivers/staging/vt6656/iwctl.c: Remove unnecessary function Marcos Paulo de Souza
2011-11-27 1:55 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).