staging:vt6656: iwctl.c: Removed unneeded function

Removed the function iwctl_giwnwid, that just return a error code.

Changes v1 to v2:
	Removed same functions of vt6655 and vt6656.

Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index d8dd7846447d46581537a135fd38c4a2f811570b..3e8283c2dc73b39a0da6d47cb77f67be35383ce7 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -3153,11 +3153,7 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
                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

diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c
index 5e425d1476b865bcb2c4606ab6d444a80638620f..87288db217859036fde70f63aece76903c2d48b3 100644 (file)
--- a/drivers/staging/vt6655/iwctl.c
+++ b/drivers/staging/vt6655/iwctl.c
@@ -151,18 +151,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/vt6655/iwctl.h b/drivers/staging/vt6655/iwctl.h
index 3096de0ba1bdf39f084765b238ca6cc9c32da09f..d224f913a624046e88f00618918461a01e84178e 100644 (file)
--- a/drivers/staging/vt6655/iwctl.h
+++ b/drivers/staging/vt6655/iwctl.h
@@ -79,11 +79,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/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 2121205a912b2d0d1c921f416b5ad5097fc5e337..ecfda5272fa1b95b808302b563349b024bbd9722 100644 (file)
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -128,17 +128,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
  */
@@ -1939,7 +1928,6 @@ static const iw_handler           iwctl_handler[] =
        (iw_handler) iwctl_commit,      // SIOCSIWCOMMIT
        (iw_handler) iwctl_giwname,     // SIOCGIWNAME
        (iw_handler) NULL,                              // SIOCSIWNWID
-       (iw_handler) NULL,                              // SIOCGIWNWID
        (iw_handler) iwctl_siwfreq,             // SIOCSIWFREQ
        (iw_handler) iwctl_giwfreq,             // SIOCGIWFREQ
        (iw_handler) iwctl_siwmode,             // SIOCSIWMODE

diff --git a/drivers/staging/vt6656/iwctl.h b/drivers/staging/vt6656/iwctl.h
index cc48954783fcf9a544bfce4f4734a669fd14669e..10a240e650124b2e728fc31e932b871a2610a9e6 100644 (file)
--- 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 27521b69ce0881f47970364cb76fed51d93922b4..1b382a8f671d81d42ff7aa2ca8fb2d3ab7817677 100644 (file)
--- 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