staging: rtl8192e: Convert typedef RX_REORDER_ENTRY to struct rx_reorder_entry

Remove typedef from struct.
Rename struct.
Rename uses.

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

diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
index 6c60df0..d204361 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -34,7 +34,7 @@ void RxPktPendingTimeout(unsigned long 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;
+       struct rx_reorder_entry *pReorderEntry = NULL;
 
        unsigned long flags = 0;
        struct rtllib_rxb *stats_IndicateArray[REORDER_WIN_SIZE];
@@ -46,7 +46,7 @@ void RxPktPendingTimeout(unsigned long data)
        {
                while(!list_empty(&pRxTs->RxPendingPktList))
                {
-                       pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTs->RxPendingPktList.prev,RX_REORDER_ENTRY,List);
+                       pReorderEntry = (struct rx_reorder_entry *)list_entry(pRxTs->RxPendingPktList.prev,struct rx_reorder_entry,List);
                        if (index == 0)
                                pRxTs->RxIndicateSeq = pReorderEntry->SeqNum;
 
@@ -135,7 +135,7 @@ void TSInitialize(struct rtllib_device *ieee)
 {
        struct tx_ts_record *pTxTS  = ieee->TxTsRecord;
        struct rx_ts_record *pRxTS  = ieee->RxTsRecord;
-       PRX_REORDER_ENTRY       pRxReorderEntry = ieee->RxReorderEntry;
+       struct rx_reorder_entry *pRxReorderEntry = ieee->RxReorderEntry;
        u8                              count = 0;
        RTLLIB_DEBUG(RTLLIB_DL_TS, "==========>%s()\n", __func__);
        INIT_LIST_HEAD(&ieee->Tx_TS_Admit_List);
@@ -444,14 +444,14 @@ void RemoveTsEntry(
 
        if (TxRxSelect == RX_DIR)
        {
-               PRX_REORDER_ENTRY       pRxReorderEntry;
+               struct rx_reorder_entry *pRxReorderEntry;
                struct rx_ts_record *pRxTS = (struct rx_ts_record *)pTs;
 
                if (timer_pending(&pRxTS->RxPktPendingTimer))
                        del_timer_sync(&pRxTS->RxPktPendingTimer);
 
                while(!list_empty(&pRxTS->RxPendingPktList)){
-                       pRxReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTS->RxPendingPktList.prev,RX_REORDER_ENTRY,List);
+                       pRxReorderEntry = (struct rx_reorder_entry *)list_entry(pRxTS->RxPendingPktList.prev,struct rx_reorder_entry,List);
                        RTLLIB_DEBUG(RTLLIB_DL_REORDER,"%s(): Delete SeqNum %d!\n",__func__, pRxReorderEntry->SeqNum);
                        list_del_init(&pRxReorderEntry->List);
                        {

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 2834e78..69cf468 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1791,12 +1791,11 @@ typedef struct _bandwidth_autoswitch
 
 #define REORDER_WIN_SIZE       128
 #define REORDER_ENTRY_NUM      128
-typedef struct _RX_REORDER_ENTRY
-{
+struct rx_reorder_entry {
        struct list_head        List;
        u16                     SeqNum;
        struct rtllib_rxb* prxb;
-} RX_REORDER_ENTRY, *PRX_REORDER_ENTRY;
+};
 typedef enum _Fsync_State{
        Default_Fsync,
        HW_Fsync,
@@ -2162,7 +2161,7 @@ struct rtllib_device {
        struct list_head                Rx_TS_Pending_List;
        struct list_head                Rx_TS_Unused_List;
        struct rx_ts_record RxTsRecord[TOTAL_TS_NUM];
-       RX_REORDER_ENTRY        RxReorderEntry[128];
+       struct rx_reorder_entry RxReorderEntry[128];
        struct list_head                RxReorder_Unused_List;
        u8                              ForcedPriority;
 

diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index ff69523..03e9df1 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -448,18 +448,18 @@ drop:
 bool
 AddReorderEntry(
        struct rx_ts_record *pTS,
-       PRX_REORDER_ENTRY               pReorderEntry
+       struct rx_reorder_entry *pReorderEntry
        )
 {
        struct list_head *pList = &pTS->RxPendingPktList;
 
        while(pList->next != &pTS->RxPendingPktList)
        {
-               if ( SN_LESS(pReorderEntry->SeqNum, ((PRX_REORDER_ENTRY)list_entry(pList->next,RX_REORDER_ENTRY,List))->SeqNum) )
+               if ( SN_LESS(pReorderEntry->SeqNum, ((struct rx_reorder_entry *)list_entry(pList->next,struct rx_reorder_entry,List))->SeqNum) )
                {
                        pList = pList->next;
                }
-               else if ( SN_EQUAL(pReorderEntry->SeqNum, ((PRX_REORDER_ENTRY)list_entry(pList->next,RX_REORDER_ENTRY,List))->SeqNum) )
+               else if ( SN_EQUAL(pReorderEntry->SeqNum, ((struct rx_reorder_entry *)list_entry(pList->next,struct rx_reorder_entry,List))->SeqNum) )
                {
                        return false;
                }
@@ -529,7 +529,7 @@ void rtllib_indicate_packets(struct rtllib_device *ieee, struct rtllib_rxb** prx
 void
 rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee,        struct rx_ts_record *pTS)
 {
-       PRX_REORDER_ENTRY       pRxReorderEntry;
+       struct rx_reorder_entry *pRxReorderEntry;
        struct rtllib_rxb*              RfdArray[REORDER_WIN_SIZE];
        u8                                      RfdCnt = 0;
 
@@ -542,7 +542,7 @@ rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee,     struct rx_ts_record *pTS
                        break;
                }
 
-               pRxReorderEntry = (PRX_REORDER_ENTRY)list_entry(pTS->RxPendingPktList.prev,RX_REORDER_ENTRY,List);
+               pRxReorderEntry = (struct rx_reorder_entry *)list_entry(pTS->RxPendingPktList.prev,struct rx_reorder_entry,List);
                RTLLIB_DEBUG(RTLLIB_DL_REORDER,"%s(): Indicate SeqNum %d!\n",__func__, pRxReorderEntry->SeqNum);
                list_del_init(&pRxReorderEntry->List);
 
@@ -563,7 +563,7 @@ void RxReorderIndicatePacket( struct rtllib_device *ieee,
                u16                     SeqNum)
 {
        struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
-       PRX_REORDER_ENTRY       pReorderEntry = NULL;
+       struct rx_reorder_entry *pReorderEntry = NULL;
        struct rtllib_rxb* prxbIndicateArray[REORDER_WIN_SIZE];
        u8                      WinSize = pHTInfo->RxReorderWinSize;
        u16                     WinEnd = 0;
@@ -633,7 +633,7 @@ void RxReorderIndicatePacket( struct rtllib_device *ieee,
        } else {
                /* Current packet is going to be inserted into pending list.*/
                if (!list_empty(&ieee->RxReorder_Unused_List)) {
-                       pReorderEntry = (PRX_REORDER_ENTRY)list_entry(ieee->RxReorder_Unused_List.next,RX_REORDER_ENTRY,List);
+                       pReorderEntry = (struct rx_reorder_entry *)list_entry(ieee->RxReorder_Unused_List.next,struct rx_reorder_entry,List);
                        list_del_init(&pReorderEntry->List);
 
                        /* Make a reorder entry and insert into a the packet list.*/
@@ -679,7 +679,7 @@ void RxReorderIndicatePacket( struct rtllib_device *ieee,
        while(!list_empty(&pTS->RxPendingPktList)) {
                RTLLIB_DEBUG(RTLLIB_DL_REORDER,"%s(): start RREORDER indicate\n",__func__);
 
-               pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pTS->RxPendingPktList.prev,RX_REORDER_ENTRY,List);
+               pReorderEntry = (struct rx_reorder_entry *)list_entry(pTS->RxPendingPktList.prev,struct rx_reorder_entry,List);
                if ( SN_LESS(pReorderEntry->SeqNum, pTS->RxIndicateSeq) ||
                                SN_EQUAL(pReorderEntry->SeqNum, pTS->RxIndicateSeq))
                {