libertas: remove SIOCSIWENCODE from private ioctl handler

[Marcelo Tosatti]

Commit:     80495d3b2437ab173c89eb0221ca2bd1a424f65b
Parent:     6e21a1d9653778892cd5ddf67501f624c06f2c5b
commit 80495d3b2437ab173c89eb0221ca2bd1a424f65b
Author:     Marcelo Tosatti <mtosatti at redhat.com>
AuthorDate: Wed Dec 13 18:44:03 2006 -0200
Commit:     Marcelo Tosatti <mtosatti at redhat.com>
CommitDate: Wed Dec 13 18:44:03 2006 -0200

    libertas: remove SIOCSIWENCODE from private ioctl handler
    
    Such ioctl command never reaches the private ioctl since its handled
    by generic WEXT.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
---
 drivers/net/wireless/libertas/wlan_ioctl.c |    7 -------
 drivers/net/wireless/libertas/wlan_wext.c  |    2 +-
 drivers/net/wireless/libertas/wlan_wext.h  |    3 ---
 3 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/drivers/net/wireless/libertas/wlan_ioctl.c b/drivers/net/wireless/libertas/wlan_ioctl.c
index 1ed4c76..91f20e4 100644
--- a/drivers/net/wireless/libertas/wlan_ioctl.c
+++ b/drivers/net/wireless/libertas/wlan_ioctl.c
@@ -2247,13 +2247,6 @@ int libertas_do_ioctl(struct net_device 
 		ret = wlan_scan_type_ioctl(priv, wrq);
 		break;
 
-	/* FIXME: this really should be handled by wireless extensions
-		  already, so it can probably be dropped here. */
-	case SIOCSIWENCODE:	/* set encoding token & mode for WPA */
-		ret = wlan_set_encode(dev, NULL, &(wrq->u.data),
-				      wrq->u.data.pointer);
-		break;
-
 	case WLAN_SETNONE_GETNONE:	/* set WPA mode on/off ioctl #20 */
 		switch (wrq->u.data.flags) {
 		case WLANDEAUTH:
diff --git a/drivers/net/wireless/libertas/wlan_wext.c b/drivers/net/wireless/libertas/wlan_wext.c
index 1d188da..f7c07db 100644
--- a/drivers/net/wireless/libertas/wlan_wext.c
+++ b/drivers/net/wireless/libertas/wlan_wext.c
@@ -2260,7 +2260,7 @@ static void disable_wep(struct assoc_req
  *  @param extra		A pointer to extra data buf
  *  @return 	   		WLAN_STATUS_SUCCESS --success, otherwise fail
  */
-int wlan_set_encode(struct net_device *dev,
+static int wlan_set_encode(struct net_device *dev,
 		    struct iw_request_info *info,
 		    struct iw_point *dwrq, char *extra)
 {
diff --git a/drivers/net/wireless/libertas/wlan_wext.h b/drivers/net/wireless/libertas/wlan_wext.h
index 379db97..74414f0 100644
--- a/drivers/net/wireless/libertas/wlan_wext.h
+++ b/drivers/net/wireless/libertas/wlan_wext.h
@@ -226,9 +226,6 @@ typedef struct _wlan_ioctl_adhoc_key_inf
 extern struct iw_handler_def libertas_handler_def;
 int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int i);
 int wlan_radio_ioctl(wlan_private * priv, u8 option);
-/* this one should not be needed in do_ioctl */
-int wlan_set_encode(struct net_device *dev, struct iw_request_info *info,
-			   struct iw_point *dwrq, char *extra);
 
 /** BCA TIME SHARE */
 typedef struct _wlan_ioctl_bca_timeshare_config {