diff --git a/[refs] b/[refs] index cfaa82f219db..c915c9ff0a7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a76d98497eb5b8f2ad723cfcaa58d6f7653243af +refs/heads/master: fb6209640b94087672aa42b5e5806ea0c5525339 diff --git a/trunk/drivers/staging/rtl8192e/r8192E_cmdpkt.h b/trunk/drivers/staging/rtl8192e/r8192E_cmdpkt.h index 9e92d7b88fad..07c69f22893c 100644 --- a/trunk/drivers/staging/rtl8192e/r8192E_cmdpkt.h +++ b/trunk/drivers/staging/rtl8192e/r8192E_cmdpkt.h @@ -19,8 +19,8 @@ #ifndef R819XUSB_CMDPKT_H #define R819XUSB_CMDPKT_H #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_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_DBG_MSG_SIZE sizeof(cmpk_rx_dbginfo_t) #define CMPK_TX_RAHIS_SIZE sizeof(cmpk_tx_rahis_t) @@ -65,8 +65,7 @@ struct cmpk_intr_sta { };//; -typedef struct tag_cmd_pkt_set_configuration -{ +struct cmpk_set_cfg { u8 element_id; u8 length; u16 reserve1; @@ -80,9 +79,9 @@ typedef struct tag_cmd_pkt_set_configuration u8 cfg_offset; u32 value; u32 mask; -}cmpk_set_cfg_t; +};//; -#define cmpk_query_cfg_t cmpk_set_cfg_t +#define cmpk_query_cfg_t struct cmpk_set_cfg typedef struct tag_tx_stats_feedback {