libertas: remove wlanconfig and remaining ioctl bits

[Marcelo Tosatti]

Commit:     1e1b4b9a8d4e46f3ff74e4811d2be6d8b9fa5d26
Parent:     cc30cf1f5066231fad566393f25337a23e270e92
commit 1e1b4b9a8d4e46f3ff74e4811d2be6d8b9fa5d26
Author:     Marcelo Tosatti <mtosatti at redhat.com>
AuthorDate: Thu Dec 7 00:28:57 2006 -0200
Commit:     Marcelo Tosatti <mtosatti at redhat.com>
CommitDate: Thu Dec 7 00:28:57 2006 -0200

    libertas: remove wlanconfig and remaining ioctl bits
    
    wlanconfig has been deprecated in favour of a debugfs interface.
    
    wlanconfig.c is in older driver tarballs for reference, if required.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
---
 drivers/net/wireless/libertas/hostcmd.h   |    4 ----
 drivers/net/wireless/libertas/wlan_defs.h |    2 +-
 drivers/net/wireless/libertas/wlan_scan.h |    2 --
 drivers/net/wireless/libertas/wlan_wext.c |   13 -------------
 drivers/net/wireless/libertas/wlan_wext.h |    5 -----
 5 files changed, 1 insertions(+), 25 deletions(-)

diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h
index 48c09eb..4a924fd 100644
--- a/drivers/net/wireless/libertas/hostcmd.h
+++ b/drivers/net/wireless/libertas/hostcmd.h
@@ -94,8 +94,6 @@ struct RxPD {
 	u8 Reserved[3];
 };
 
-#if defined(__KERNEL__)
-
 /* CmdCtrlNode */
 struct CmdCtrlNode {
 	/* CMD link list */
@@ -122,8 +120,6 @@ struct CmdCtrlNode {
 	wait_queue_head_t cmdwait_q;
 };
 
-#endif
-
 /* MRVL_WEP_KEY */
 #if 0
 // unused at the moment
diff --git a/drivers/net/wireless/libertas/wlan_defs.h b/drivers/net/wireless/libertas/wlan_defs.h
index e4d18b5..3161e9f 100644
--- a/drivers/net/wireless/libertas/wlan_defs.h
+++ b/drivers/net/wireless/libertas/wlan_defs.h
@@ -115,7 +115,7 @@ #define	ENTER()			dprintk(1, "Enter: %s,
 #define	LEAVE()			dprintk(1, "Leave: %s, %s:%i\n", __FUNCTION__, \
 							__FILE__, __LINE__)
 
-#if defined(DEBUG) && defined(__KERNEL__)
+#if defined(DEBUG)
 static inline void HEXDUMP(char *prompt, u8 * buf, int len)
 {
 	int i = 0;
diff --git a/drivers/net/wireless/libertas/wlan_scan.h b/drivers/net/wireless/libertas/wlan_scan.h
index ee85385..18e9cd3 100644
--- a/drivers/net/wireless/libertas/wlan_scan.h
+++ b/drivers/net/wireless/libertas/wlan_scan.h
@@ -234,7 +234,6 @@ int wlan_scan_networks(wlan_private * pr
 
 struct ifreq;
 
-#ifdef __KERNEL__
 struct iw_point;
 struct iw_param;
 struct iw_request_info;
@@ -242,6 +241,5 @@ extern int libertas_get_scan(struct net_
 			 struct iw_point *dwrq, char *extra);
 extern int libertas_set_scan(struct net_device *dev, struct iw_request_info *info,
 			 struct iw_param *vwrq, char *extra);
-#endif
 
 #endif				/* _WLAN_SCAN_H */
diff --git a/drivers/net/wireless/libertas/wlan_wext.c b/drivers/net/wireless/libertas/wlan_wext.c
index d62b41a..d3870e5 100644
--- a/drivers/net/wireless/libertas/wlan_wext.c
+++ b/drivers/net/wireless/libertas/wlan_wext.c
@@ -1249,13 +1249,6 @@ static const struct iw_priv_args wlan_pr
 	/*
 	 * { cmd, set_args, get_args, name } 
 	 */
-	/* XXX: converted to debugfs, remove */
-	{
-	 WLANEXTSCAN,
-	 IW_PRIV_TYPE_INT,
-	 IW_PRIV_TYPE_CHAR | 2,
-	 "extscan"},
-
 	{
 	 WLANCISDUMP,
 	 IW_PRIV_TYPE_NONE,
@@ -1551,12 +1544,6 @@ #endif				/* REASSOCIATION */
 	 IW_PRIV_TYPE_CHAR | 128,
 	 IW_PRIV_TYPE_CHAR | 128,
 	 ""},
-	/* XXX: converted to debugfs, remove */
-	{
-	 WLANSLEEPPARAMS,
-	 IW_PRIV_TYPE_CHAR | 128,
-	 IW_PRIV_TYPE_CHAR | 128,
-	 "sleepparams"},
 	/* BT Management */
 	{
 	 WLAN_SUBCMD_BT_ADD,
diff --git a/drivers/net/wireless/libertas/wlan_wext.h b/drivers/net/wireless/libertas/wlan_wext.h
index aa500c2..f73d1e4 100644
--- a/drivers/net/wireless/libertas/wlan_wext.h
+++ b/drivers/net/wireless/libertas/wlan_wext.h
@@ -129,7 +129,6 @@ #define WLAN_SET_DEBUGMODE			17
 #define WLAN_SUBCMD_MESH_SET_TTL		18
 
 #define WLAN_SET128CHAR_GET128CHAR	(WLANIOCTL + 25)
-#define WLANSLEEPPARAMS 			2
 #define WLANSCAN_MODE				6
 
 #define WLAN_GET_ADHOC_STATUS			9
@@ -144,8 +143,6 @@ #define WLAN_SUBCMD_FWT_LIST_NEIGHBOR			
 #define WLAN_SUBCMD_FWT_LIST			25
 #define WLAN_SUBCMD_FWT_LIST_ROUTE			26
 
-#define WLANEXTSCAN			(WLANIOCTL + 26)
-
 #define WLAN_SET_GET_SIXTEEN_INT       (WLANIOCTL + 29)
 #define WLAN_TPCCFG                             1
 #define WLAN_POWERCFG                           2
@@ -228,14 +225,12 @@ typedef struct _wlan_ioctl_adhoc_key_inf
 	u8 tkiprxmickey[16];
 } wlan_ioctl_adhoc_key_info;
 
-#ifdef __KERNEL__
 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);
-#endif
 
 /** BCA TIME SHARE */
 typedef struct _wlan_ioctl_bca_timeshare_config {