libertas: remove remaining wlanconfig ioctl struct definitions

[Marcelo Tosatti]

Commit:     c5f26dcd436883549d406d95f7412e7dc8983dd0
Parent:     9343bdcdc90b4836092dac3d9e6ab4bd24d6660b
commit c5f26dcd436883549d406d95f7412e7dc8983dd0
Author:     Marcelo Tosatti <mtosatti at redhat.com>
AuthorDate: Thu Dec 14 15:26:37 2006 -0200
Commit:     Marcelo Tosatti <mtosatti at redhat.com>
CommitDate: Thu Dec 14 15:26:37 2006 -0200

    libertas: remove remaining wlanconfig ioctl struct definitions
    
    Subject says it all.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
---
 drivers/net/wireless/libertas/wlan_cmd.c     |    2 -
 drivers/net/wireless/libertas/wlan_cmdresp.c |    4 +-
 drivers/net/wireless/libertas/wlan_ethtool.c |    4 +-
 drivers/net/wireless/libertas/wlan_wext.h    |   56 +-------------------------
 4 files changed, 8 insertions(+), 58 deletions(-)

diff --git a/drivers/net/wireless/libertas/wlan_cmd.c b/drivers/net/wireless/libertas/wlan_cmd.c
index e9811d2..7dce501 100644
--- a/drivers/net/wireless/libertas/wlan_cmd.c
+++ b/drivers/net/wireless/libertas/wlan_cmd.c
@@ -1056,7 +1056,7 @@ static int wlan_cmd_802_11_eeprom_access
 					 struct HostCmd_DS_COMMAND *cmd,
 					 int cmd_action, void *pdata_buf)
 {
-	wlan_ioctl_regrdwr *ea = pdata_buf;
+	struct wlan_ioctl_regrdwr *ea = pdata_buf;
 
 	ENTER();
 
diff --git a/drivers/net/wireless/libertas/wlan_cmdresp.c b/drivers/net/wireless/libertas/wlan_cmdresp.c
index f5c8e60..4f695f4 100644
--- a/drivers/net/wireless/libertas/wlan_cmdresp.c
+++ b/drivers/net/wireless/libertas/wlan_cmdresp.c
@@ -787,7 +787,9 @@ static int wlan_ret_802_11_eeprom_access
 				  struct HostCmd_DS_COMMAND *resp)
 {
 	wlan_adapter *Adapter = priv->adapter;
-	wlan_ioctl_regrdwr *pBuf = (wlan_ioctl_regrdwr *) Adapter->pRdeeprom;
+	struct wlan_ioctl_regrdwr *pBuf;
+	pBuf = (struct wlan_ioctl_regrdwr *) Adapter->pRdeeprom;
+
 	dprintk(1, "eeprom read len=%x\n",
 	       le16_to_cpu(resp->params.rdeeprom.ByteCount));
 	if (pBuf->NOB < le16_to_cpu(resp->params.rdeeprom.ByteCount)) {
diff --git a/drivers/net/wireless/libertas/wlan_ethtool.c b/drivers/net/wireless/libertas/wlan_ethtool.c
index 0d7cde6..9976545 100644
--- a/drivers/net/wireless/libertas/wlan_ethtool.c
+++ b/drivers/net/wireless/libertas/wlan_ethtool.c
@@ -49,7 +49,7 @@ static int libertas_ethtool_get_eeprom(s
 {
 	wlan_private *priv = (wlan_private *) dev->priv;
 	wlan_adapter *Adapter = priv->adapter;
-	wlan_ioctl_regrdwr regctrl;
+	struct wlan_ioctl_regrdwr regctrl;
 	char *ptr;
 	int ret;
 
@@ -91,7 +91,7 @@ static int libertas_ethtool_get_eeprom(s
 	ptr = (char *)Adapter->pRdeeprom;
 
 	/* skip the command header, but include the "Value" u32 variable */
-	ptr = ptr + sizeof(wlan_ioctl_regrdwr) - 4;
+	ptr = ptr + sizeof(struct wlan_ioctl_regrdwr) - 4;
 
 	/*
 	 * Return the result back to the user
diff --git a/drivers/net/wireless/libertas/wlan_wext.h b/drivers/net/wireless/libertas/wlan_wext.h
index 74414f0..fae0dcc 100644
--- a/drivers/net/wireless/libertas/wlan_wext.h
+++ b/drivers/net/wireless/libertas/wlan_wext.h
@@ -179,24 +179,8 @@ #define SKIP_ACTION				2
 #define SKIP_TYPE_SIZE			(SKIP_TYPE + SKIP_SIZE)
 #define SKIP_TYPE_ACTION		(SKIP_TYPE + SKIP_ACTION)
 
-/** wlan_ioctl */
-typedef struct _wlan_ioctl {
-	/** Command ID */
-	u16 command;
-	/** data length */
-	u16 len;
-	/** data pointer */
-	u8 *data;
-} wlan_ioctl;
-
-/** wlan_ioctl_rfantenna */
-typedef struct _wlan_ioctl_rfantenna {
-	u16 Action;
-	u16 AntennaMode;
-} wlan_ioctl_rfantenna;
-
 /** wlan_ioctl_regrdwr */
-typedef struct _wlan_ioctl_regrdwr {
+struct wlan_ioctl_regrdwr {
 	/** Which register to access */
 	u16 WhichReg;
 	/** Read or Write */
@@ -204,46 +188,10 @@ typedef struct _wlan_ioctl_regrdwr {
 	u32 Offset;
 	u16 NOB;
 	u32 Value;
-} wlan_ioctl_regrdwr;
-
-/** wlan_ioctl_rdeeprom */
-typedef struct _wlan_ioctl_rdeeprom {
-	u16 WhichReg;
-	u16 Action;
-	u16 Offset;
-	u16 NOB;
-	u8 Value;
-} wlan_ioctl_rdeeprom;
-
-/** wlan_ioctl_adhoc_key_info */
-typedef struct _wlan_ioctl_adhoc_key_info {
-	u16 action;
-	u8 key[16];
-	u8 tkiptxmickey[16];
-	u8 tkiprxmickey[16];
-} wlan_ioctl_adhoc_key_info;
+};
 
 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);
 
-/** BCA TIME SHARE */
-typedef struct _wlan_ioctl_bca_timeshare_config {
-	/** ACT_GET/ACT_SET */
-	u16 Action;
-	/** Type: WLAN, BT */
-	u16 TrafficType;
-	/** Interval: 20msec - 60000msec */
-	u32 TimeShareInterval;
-	/** PTA arbiter time in msec */
-	u32 BTTime;
-} __attribute__ ((packed)) wlan_ioctl_bca_timeshare_config,
-    *pwlan_ioctl_bca_timeshare_config;
-
-typedef struct _wlan_ioctl_reassociation_info {
-	u8 CurrentBSSID[6];
-	u8 DesiredBSSID[6];
-	char DesiredSSID[IW_ESSID_MAX_SIZE + 1];
-} __attribute__ ((packed)) wlan_ioctl_reassociation_info;
-
 #endif				/* _WLAN_WEXT_H_ */