From d3ab7211bd49b4df8e1469f73aa17662319d6c66 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 18 Jul 2011 22:59:06 -0500 Subject: [PATCH] staging: rtl8192e: Convert typedef cmpk_txfb_t to struct cmpk_txfb Remove typedef from struct. Rename struct. Rename uses. Signed-off-by: Larry Finger --- 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 2ff69ef91296..026e3996655a 100644 --- a/drivers/staging/rtl8192e/r8192E_cmdpkt.c +++ b/drivers/staging/rtl8192e/r8192E_cmdpkt.c @@ -104,7 +104,7 @@ Failed: static void cmpk_count_txstatistic( struct net_device *dev, - cmpk_txfb_t *pstx_fb) + struct cmpk_txfb *pstx_fb) { struct r8192_priv *priv = rtllib_priv(dev); #ifdef ENABLE_PS @@ -158,12 +158,12 @@ cmpk_handle_tx_feedback( u8 * pmsg) { struct r8192_priv *priv = rtllib_priv(dev); - cmpk_txfb_t rx_tx_fb; /* */ + struct cmpk_txfb rx_tx_fb; /* */ priv->stats.txfeedback++; - memcpy((u8*)&rx_tx_fb, pmsg, sizeof(cmpk_txfb_t)); + memcpy((u8*)&rx_tx_fb, pmsg, sizeof(struct cmpk_txfb)); cmpk_count_txstatistic(dev, &rx_tx_fb); } /* cmpk_Handle_Tx_Feedback */ diff --git a/drivers/staging/rtl8192e/r8192E_cmdpkt.h b/drivers/staging/rtl8192e/r8192E_cmdpkt.h index 787337064bcf..e3278434b1f1 100644 --- a/drivers/staging/rtl8192e/r8192E_cmdpkt.h +++ b/drivers/staging/rtl8192e/r8192E_cmdpkt.h @@ -18,7 +18,7 @@ ******************************************************************************/ #ifndef R819XUSB_CMDPKT_H #define R819XUSB_CMDPKT_H -#define CMPK_RX_TX_FB_SIZE sizeof(cmpk_txfb_t) +#define CMPK_RX_TX_FB_SIZE sizeof(struct cmpk_txfb) #define CMPK_TX_SET_CONFIG_SIZE sizeof(cmpk_set_cfg_t) #define CMPK_BOTH_QUERY_CONFIG_SIZE sizeof(cmpk_set_cfg_t) #define CMPK_RX_TX_STS_SIZE sizeof(cmpk_tx_status_t) @@ -30,8 +30,7 @@ #define ISR_BcnTimerIntr BIT13 -typedef struct tag_cmd_pkt_tx_feedback -{ +struct cmpk_txfb { u8 element_id; u8 length; u8 TID:4; /* */ @@ -56,7 +55,7 @@ typedef struct tag_cmd_pkt_tx_feedback u16 reserve3; /* */ u16 duration; /* */ -}cmpk_txfb_t; +};//; typedef struct tag_cmd_pkt_interrupt_status { -- 2.20.1