libertas: remove unused CIS dump ioctl and assorted code

[Marcelo Tosatti]

Commit:     740c6b3f83d5a4a93c479ae7e79874c069314a92
Parent:     7ca0599b43159b5176db7d69c46b883a9c373250
commit 740c6b3f83d5a4a93c479ae7e79874c069314a92
Author:     Marcelo Tosatti <mtosatti at redhat.com>
AuthorDate: Wed Dec 13 18:13:41 2006 -0200
Commit:     Andres Salomon <dilinger at debian.org>
CommitDate: Wed Dec 20 15:44:13 2006 -0500

    libertas: remove unused CIS dump ioctl and assorted code
    
    Subject says it all.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
    (cherry picked from 9bc4ac975b44d8d4a2eed2438b7bc11408215f93 commit)
---
 drivers/net/wireless/libertas/wlan_dev.h   |    3 ---
 drivers/net/wireless/libertas/wlan_ioctl.c |   31 ----------------------------
 drivers/net/wireless/libertas/wlan_wext.c  |    6 -----
 drivers/net/wireless/libertas/wlan_wext.h  |    1 -
 4 files changed, 0 insertions(+), 41 deletions(-)

diff --git a/drivers/net/wireless/libertas/wlan_dev.h b/drivers/net/wireless/libertas/wlan_dev.h
index f90c0a7..788c59d 100644
--- a/drivers/net/wireless/libertas/wlan_dev.h
+++ b/drivers/net/wireless/libertas/wlan_dev.h
@@ -461,9 +461,6 @@ #define	MAX_REGION_CHANNEL_NUM	2
 	struct wlan_802_11d_state State11D;
 
 	/**	MISCELLANEOUS */
-	/* Card Information Structure */
-	u8 CisInfoBuf[512];
-	u16 CisInfoLen;
 	u8 *pRdeeprom;
 	struct wlan_offset_value OffsetValue;
 
diff --git a/drivers/net/wireless/libertas/wlan_ioctl.c b/drivers/net/wireless/libertas/wlan_ioctl.c
index ecb8884..1ed4c76 100644
--- a/drivers/net/wireless/libertas/wlan_ioctl.c
+++ b/drivers/net/wireless/libertas/wlan_ioctl.c
@@ -1261,33 +1261,6 @@ static int wlan_do_getlog_ioctl(wlan_pri
 }
 
 /**
- *  @brief Read the CIS Table
- *  @param priv                 A pointer to wlan_private structure
- *  @param req			A pointer to ifreq structure
- *  @return 	   		WLAN_STATUS_SUCCESS --success, otherwise fail
- */
-static int wlan_do_getcis_ioctl(wlan_private * priv, struct ifreq *req)
-{
-	int ret = WLAN_STATUS_SUCCESS;
-	struct iwreq *wrq = (struct iwreq *)req;
-	wlan_adapter *Adapter = priv->adapter;
-
-	ENTER();
-
-	if (wrq->u.data.pointer) {
-		if (copy_to_user(wrq->u.data.pointer, Adapter->CisInfoBuf,
-				 Adapter->CisInfoLen)) {
-			dprintk(1, "Copy to user failed\n");
-			return -EFAULT;
-		}
-		wrq->u.data.length = Adapter->CisInfoLen;
-	}
-
-	LEAVE();
-	return ret;
-}
-
-/**
  *  @brief Set scan type
  *
  *  @param priv		A pointer to wlan_private structure
@@ -2269,10 +2242,6 @@ int libertas_do_ioctl(struct net_device 
 
 	dprintk(1, "libertas_do_ioctl: ioctl cmd = 0x%x\n", cmd);
 	switch (cmd) {
-	case WLANCISDUMP:	/* Read CIS Table  */
-		ret = wlan_do_getcis_ioctl(priv, req);
-		break;
-
 	case WLANSCAN_TYPE:
 		dprintk(1, "Scan Type Ioctl\n");
 		ret = wlan_scan_type_ioctl(priv, wrq);
diff --git a/drivers/net/wireless/libertas/wlan_wext.c b/drivers/net/wireless/libertas/wlan_wext.c
index 590cbfd..1d188da 100644
--- a/drivers/net/wireless/libertas/wlan_wext.c
+++ b/drivers/net/wireless/libertas/wlan_wext.c
@@ -1231,12 +1231,6 @@ static const struct iw_priv_args wlan_pr
 	 * { cmd, set_args, get_args, name } 
 	 */
 	{
-	 WLANCISDUMP,
-	 IW_PRIV_TYPE_NONE,
-	 IW_PRIV_TYPE_BYTE | 512,
-	 "getcis"},
-
-	{
 	 WLANSCAN_TYPE,
 	 IW_PRIV_TYPE_CHAR | 8,
 	 IW_PRIV_TYPE_CHAR | 8,
diff --git a/drivers/net/wireless/libertas/wlan_wext.h b/drivers/net/wireless/libertas/wlan_wext.h
index f73d1e4..61aea92 100644
--- a/drivers/net/wireless/libertas/wlan_wext.h
+++ b/drivers/net/wireless/libertas/wlan_wext.h
@@ -37,7 +37,6 @@ #define SUBCMD_OFFSET			4
 #define	WLANIOCTL			SIOCIWFIRSTPRIV
 
 #define WLANSETWPAIE			(WLANIOCTL + 0)
-#define WLANCISDUMP 			(WLANIOCTL + 1)
 #define MAX_EEPROM_DATA     			256
 
 #define WLAN_SETINT_GETINT		(WLANIOCTL + 7)