---

yaml --- r: 267766 b: refs/heads/master c: 7f6aa06 h: refs/heads/master v: v3
git-mirror · Aug 24, 2011 · f9def07 · f9def07
1 parent d888ae5
commit f9def07
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb6209640b94087672aa42b5e5806ea0c5525339
+refs/heads/master: 7f6aa06ca2155dd1e6ca62f5ca81c09fbb9a8cb3
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_cmdpkt.c b/trunk/drivers/staging/rtl8192e/r8192E_cmdpkt.c
@@ -266,7 +266,7 @@ cmpk_handle_query_config_rx(
 
 
 static	void	cmpk_count_tx_status(	struct net_device *dev,
-									cmpk_tx_status_t	*pstx_status)
+									struct cmpk_tx_status *pstx_status)
 {
 	struct r8192_priv *priv = rtllib_priv(dev);
 
@@ -314,9 +314,9 @@ cmpk_handle_tx_status(
 	struct net_device *dev,
 	u8*	   pmsg)
 {
-	cmpk_tx_status_t	rx_tx_sts;	/* */
+	struct cmpk_tx_status rx_tx_sts;	/* */
 
-	memcpy((void*)&rx_tx_sts, (void*)pmsg, sizeof(cmpk_tx_status_t));
+	memcpy((void*)&rx_tx_sts, (void*)pmsg, sizeof(struct cmpk_tx_status));
 	cmpk_count_tx_status(dev, &rx_tx_sts);
 
 }

diff --git a/trunk/drivers/staging/rtl8192e/r8192E_cmdpkt.h b/trunk/drivers/staging/rtl8192e/r8192E_cmdpkt.h
@@ -21,7 +21,7 @@
 #define		CMPK_RX_TX_FB_SIZE					sizeof(struct cmpk_txfb)
 #define		CMPK_TX_SET_CONFIG_SIZE				sizeof(struct cmpk_set_cfg)
 #define		CMPK_BOTH_QUERY_CONFIG_SIZE			sizeof(struct cmpk_set_cfg)
-#define		CMPK_RX_TX_STS_SIZE					sizeof(cmpk_tx_status_t)
+#define		CMPK_RX_TX_STS_SIZE					sizeof(struct cmpk_tx_status)
 #define		CMPK_RX_DBG_MSG_SIZE			sizeof(cmpk_rx_dbginfo_t)
 #define		CMPK_TX_RAHIS_SIZE			sizeof(cmpk_tx_rahis_t)
 
@@ -83,8 +83,7 @@ struct cmpk_set_cfg {
 
 #define		cmpk_query_cfg_t	struct cmpk_set_cfg
 
-typedef struct tag_tx_stats_feedback
-{
+struct cmpk_tx_status {
 	u16	reserve1;
 	u8	length;
 	u8	element_id;
@@ -111,7 +110,7 @@ typedef struct tag_tx_stats_feedback
 	u16	reserve3_23;
 	u8	reserve3_1;
 	u8	rate;
-}__attribute__((packed)) cmpk_tx_status_t;
+}__packed;
 
 typedef struct tag_rx_debug_message_feedback
 {