From 1b419253af60f87c6844c17ef0c0b24d0676cf26 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Mon, 18 Jul 2011 23:06:46 -0500
Subject: [PATCH] staging: rtl8192e: Convert typedef cmpk_tx_rahis_t to struct
 cmpk_tx_rahis

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
 drivers/staging/rtl8192e/r8192E_cmdpkt.c | 6 +++---
 drivers/staging/rtl8192e/r8192E_cmdpkt.h | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/r8192E_cmdpkt.c
index 46efaa32236..6782f320fad 100644
--- a/drivers/staging/rtl8192e/r8192E_cmdpkt.c
+++ b/drivers/staging/rtl8192e/r8192E_cmdpkt.c
@@ -327,9 +327,9 @@ cmpk_handle_tx_rate_history(
 	struct net_device *dev,
 	u8*	   pmsg)
 {
-	cmpk_tx_rahis_t	*ptxrate;
+	struct cmpk_tx_rahis *ptxrate;
 	u8				i, j;
-	u16				length = sizeof(cmpk_tx_rahis_t);
+	u16				length = sizeof(struct cmpk_tx_rahis);
 	u32				*ptemp;
 	struct r8192_priv *priv = rtllib_priv(dev);
 
@@ -354,7 +354,7 @@ cmpk_handle_tx_rate_history(
 		ptemp[i] = (temp1<<16)|temp2;
 	}
 
-	ptxrate = (cmpk_tx_rahis_t *)pmsg;
+	ptxrate = (struct cmpk_tx_rahis *)pmsg;
 
 	if (ptxrate == NULL )
 	{
diff --git a/drivers/staging/rtl8192e/r8192E_cmdpkt.h b/drivers/staging/rtl8192e/r8192E_cmdpkt.h
index c70694e4671..6fc37b66c29 100644
--- a/drivers/staging/rtl8192e/r8192E_cmdpkt.h
+++ b/drivers/staging/rtl8192e/r8192E_cmdpkt.h
@@ -23,7 +23,7 @@
 #define		CMPK_BOTH_QUERY_CONFIG_SIZE			sizeof(struct cmpk_set_cfg)
 #define		CMPK_RX_TX_STS_SIZE					sizeof(struct cmpk_tx_status)
 #define		CMPK_RX_DBG_MSG_SIZE			sizeof(struct cmpk_rx_dbginfo)
-#define		CMPK_TX_RAHIS_SIZE			sizeof(cmpk_tx_rahis_t)
+#define		CMPK_TX_RAHIS_SIZE			sizeof(struct cmpk_tx_rahis)
 
 #define ISR_TxBcnOk					BIT27
 #define ISR_TxBcnErr				BIT26
@@ -120,8 +120,7 @@ struct cmpk_rx_dbginfo {
 
 };//;
 
-typedef struct tag_tx_rate_history
-{
+struct cmpk_tx_rahis {
 	u8	element_id;
 	u8	length;
 	u16	reserved1;
@@ -136,7 +135,7 @@ typedef struct tag_tx_rate_history
 
 	u16	ht_mcs[4][16];
 
-}__attribute__((packed)) cmpk_tx_rahis_t;
+} __packed;
 
 typedef enum tag_command_packet_directories
 {