staging: rtl8192e: Convert typedef RX_TS_RECORD to struct rx_ts_record

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c
index e35bc52..42e66a5 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c
@@ -53,7 +53,7 @@ u8 TxTsDeleteBA( struct rtllib_device* ieee, struct tx_ts_record *pTxTs)
        return bSendDELBA;
 }
 
-u8 RxTsDeleteBA( struct rtllib_device* ieee, PRX_TS_RECORD     pRxTs)
+u8 RxTsDeleteBA( struct rtllib_device* ieee, struct rx_ts_record *pRxTs)
 {
        PBA_RECORD              pBa = &pRxTs->RxAdmittedBARecord;
        u8                      bSendDELBA = false;
@@ -244,7 +244,7 @@ int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb)
        PBA_PARAM_SET   pBaParamSet = NULL;
        u16* pBaTimeoutVal = NULL;
        PSEQUENCE_CONTROL pBaStartSeqCtrl = NULL;
-       PRX_TS_RECORD   pTS = NULL;
+       struct rx_ts_record *pTS = NULL;
 
        if (skb->len < sizeof( struct rtllib_hdr_3addr) + 9)
        {
@@ -457,7 +457,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb)
 
        if (pDelBaParamSet->field.Initiator == 1)
        {
-               PRX_TS_RECORD   pRxTs;
+               struct rx_ts_record *pRxTs;
 
                if ( !GetTs(
                                ieee,
@@ -544,7 +544,7 @@ TsInitDelBA( struct rtllib_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELEC
        }
        else if (TxRxSelect == RX_DIR)
        {
-               PRX_TS_RECORD   pRxTs = (PRX_TS_RECORD)pTsCommonInfo;
+               struct rx_ts_record *pRxTs = (struct rx_ts_record *)pTsCommonInfo;
                if (RxTsDeleteBA(ieee, pRxTs))
                        rtllib_send_DELBA(
                                ieee,
@@ -578,7 +578,7 @@ void TxBaInactTimeout(unsigned long data)
 
 void RxBaInactTimeout(unsigned long data)
 {
-       PRX_TS_RECORD   pRxTs = (PRX_TS_RECORD)data;
+       struct rx_ts_record *pRxTs = (struct rx_ts_record *)data;
        struct rtllib_device *ieee = container_of(pRxTs, struct rtllib_device, RxTsRecord[pRxTs->num]);
 
        RxTsDeleteBA(ieee, pRxTs);

diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl8192e/rtl819x_TS.h
index 75006c0..aa758a6 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_TS.h
+++ b/drivers/staging/rtl8192e/rtl819x_TS.h
@@ -55,7 +55,7 @@ struct tx_ts_record {
        u8                              num;
 };
 
-typedef struct _RX_TS_RECORD {
+struct rx_ts_record {
        TS_COMMON_INFO          TsCommonInfo;
        u16                             RxIndicateSeq;
        u16                             RxTimeoutIndicateSeq;
@@ -65,7 +65,7 @@ typedef struct _RX_TS_RECORD {
        u16                             RxLastSeqNum;
        u8                              RxLastFragNum;
        u8                              num;
-} RX_TS_RECORD, *PRX_TS_RECORD;
+};
 
 
 #endif

diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
index ca5effa..2ddb652 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -31,7 +31,7 @@ void TsInactTimeout(unsigned long data)
 
 void RxPktPendingTimeout(unsigned long data)
 {
-       PRX_TS_RECORD   pRxTs = (PRX_TS_RECORD)data;
+       struct rx_ts_record *pRxTs = (struct rx_ts_record *)data;
        struct rtllib_device *ieee = container_of(pRxTs, struct rtllib_device, RxTsRecord[pRxTs->num]);
 
        PRX_REORDER_ENTRY       pReorderEntry = NULL;
@@ -123,7 +123,7 @@ void ResetTxTsEntry(struct tx_ts_record *pTS)
        ResetBaEntry(&pTS->TxPendingBARecord);
 }
 
-void ResetRxTsEntry(PRX_TS_RECORD pTS)
+void ResetRxTsEntry(struct rx_ts_record *pTS)
 {
        ResetTsCommonInfo(&pTS->TsCommonInfo);
        pTS->RxIndicateSeq = 0xffff;
@@ -134,7 +134,7 @@ void ResetRxTsEntry(PRX_TS_RECORD pTS)
 void TSInitialize(struct rtllib_device *ieee)
 {
        struct tx_ts_record *pTxTS  = ieee->TxTsRecord;
-       PRX_TS_RECORD           pRxTS  = ieee->RxTsRecord;
+       struct rx_ts_record *pRxTS  = ieee->RxTsRecord;
        PRX_REORDER_ENTRY       pRxReorderEntry = ieee->RxReorderEntry;
        u8                              count = 0;
        RTLLIB_DEBUG(RTLLIB_DL_TS, "==========>%s()\n", __func__);
@@ -402,7 +402,7 @@ bool GetTs(
                                        ResetTxTsEntry(tmp);
                                }
                                else{
-                                       PRX_TS_RECORD tmp = container_of(*ppTS, RX_TS_RECORD, TsCommonInfo);
+                                       struct rx_ts_record *tmp = container_of(*ppTS, struct rx_ts_record, TsCommonInfo);
                                        ResetRxTsEntry(tmp);
                                }
 
@@ -445,7 +445,7 @@ void RemoveTsEntry(
        if (TxRxSelect == RX_DIR)
        {
                PRX_REORDER_ENTRY       pRxReorderEntry;
-               PRX_TS_RECORD           pRxTS = (PRX_TS_RECORD)pTs;
+               struct rx_ts_record *pRxTS = (struct rx_ts_record *)pTs;
 
                if (timer_pending(&pRxTS->RxPktPendingTimer))
                        del_timer_sync(&pRxTS->RxPktPendingTimer);

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index ade9888..4fd0e0c 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -2164,7 +2164,7 @@ struct rtllib_device {
        struct list_head                Rx_TS_Admit_List;
        struct list_head                Rx_TS_Pending_List;
        struct list_head                Rx_TS_Unused_List;
-       RX_TS_RECORD            RxTsRecord[TOTAL_TS_NUM];
+       struct rx_ts_record RxTsRecord[TOTAL_TS_NUM];
        RX_REORDER_ENTRY        RxReorderEntry[128];
        struct list_head                RxReorder_Unused_List;
        u8                              ForcedPriority;
@@ -2993,7 +2993,7 @@ bool rtllib_MgntDisconnect(struct rtllib_device* rtllib,u8 asRsn);
  * ieee handler to refer to it.
  */
 extern void rtllib_update_active_chan_map(struct rtllib_device *ieee);
-extern void rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, PRX_TS_RECORD pTS);
+extern void rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, struct rx_ts_record *pTS);
 extern int rtllib_data_xmit(struct sk_buff *skb, struct net_device *dev);
 extern int rtllib_parse_info_param(struct rtllib_device *ieee,
                struct rtllib_info_element *info_element,

diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index 2c4e777..3571531 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -447,7 +447,7 @@ drop:
 }
 bool
 AddReorderEntry(
-       PRX_TS_RECORD                   pTS,
+       struct rx_ts_record *pTS,
        PRX_REORDER_ENTRY               pReorderEntry
        )
 {
@@ -527,7 +527,7 @@ void rtllib_indicate_packets(struct rtllib_device *ieee, struct rtllib_rxb** prx
 }
 
 void
-rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee,        PRX_TS_RECORD pTS)
+rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee,        struct rx_ts_record *pTS)
 {
        PRX_REORDER_ENTRY       pRxReorderEntry;
        struct rtllib_rxb*              RfdArray[REORDER_WIN_SIZE];
@@ -559,7 +559,7 @@ rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee,     PRX_TS_RECORD pTS)
 
 void RxReorderIndicatePacket( struct rtllib_device *ieee,
                struct rtllib_rxb* prxb,
-               PRX_TS_RECORD           pTS,
+               struct rx_ts_record *pTS,
                u16                     SeqNum)
 {
        PRT_HIGH_THROUGHPUT     pHTInfo = ieee->pHTInfo;
@@ -896,7 +896,7 @@ int rtllib_rx_check_duplicate(struct rtllib_device *ieee, struct sk_buff *skb, u
                        }
                }
        } else {
-               PRX_TS_RECORD pRxTS = NULL;
+               struct rx_ts_record *pRxTS = NULL;
                if (GetTs(ieee, (PTS_COMMON_INFO*) &pRxTS, hdr->addr2,
                        (u8)Frame_QoSTID((u8*)(skb->data)), RX_DIR, true)) {
                        if ((fc & (1<<11)) && (frag == pRxTS->RxLastFragNum) &&
@@ -1253,7 +1253,7 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
        struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data;
        struct rtllib_crypt_data *crypt = NULL;
        struct rtllib_rxb* rxb = NULL;
-       PRX_TS_RECORD pTS = NULL;
+       struct rx_ts_record *pTS = NULL;
        u16 fc, sc, SeqNum = 0;
        u8 type, stype, multicast = 0, unicast = 0, nr_subframes = 0, TID = 0;
        u8 dst[ETH_ALEN], src[ETH_ALEN], bssid[ETH_ALEN] = {0}, *payload;