Commit 3eb9aa00 authored by Bhanusree Pola's avatar Bhanusree Pola Committed by Greg Kroah-Hartman

staging: rtl8192u: Remove typedef for struct _RX_REORDER_ENTRY

-Avoid typedefs for structure types to maintain kernel coding style.
-Remove typedefs RX_REORDER_ENTRY  and *PRX_REORDER_ENTRY  of struct _RX_REORDER_ENTRY .
-Change Structure name _RX_REORDER_ENTRY  to rx_reorder_entry to maintain Linux kernel Coding Style.
-Replace occurences of RX_REORDER_ENTRY  to struct rx_reorder_entry.
-Replace occurences of PRX_REORDER_ENTRY  to struct rx_reorder_entry *.
Signed-off-by: default avatarBhanusree Pola <bhanusreemahesh@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00b0f841
...@@ -1474,11 +1474,11 @@ struct bandwidth_autoswitch { ...@@ -1474,11 +1474,11 @@ struct bandwidth_autoswitch {
#define REORDER_WIN_SIZE 128 #define REORDER_WIN_SIZE 128
#define REORDER_ENTRY_NUM 128 #define REORDER_ENTRY_NUM 128
typedef struct _RX_REORDER_ENTRY { struct rx_reorder_entry {
struct list_head List; struct list_head List;
u16 SeqNum; u16 SeqNum;
struct ieee80211_rxb *prxb; struct ieee80211_rxb *prxb;
} RX_REORDER_ENTRY, *PRX_REORDER_ENTRY; };
//added by amy for order //added by amy for order
typedef enum _Fsync_State { typedef enum _Fsync_State {
Default_Fsync, Default_Fsync,
...@@ -1654,7 +1654,7 @@ struct ieee80211_device { ...@@ -1654,7 +1654,7 @@ struct ieee80211_device {
struct list_head Rx_TS_Unused_List; struct list_head Rx_TS_Unused_List;
struct rx_ts_record RxTsRecord[TOTAL_TS_NUM]; struct rx_ts_record RxTsRecord[TOTAL_TS_NUM];
//#ifdef TO_DO_LIST //#ifdef TO_DO_LIST
RX_REORDER_ENTRY RxReorderEntry[128]; struct rx_reorder_entry RxReorderEntry[128];
struct list_head RxReorder_Unused_List; struct list_head RxReorder_Unused_List;
//#endif //#endif
// Qos related. Added by Annie, 2005-11-01. // Qos related. Added by Annie, 2005-11-01.
......
...@@ -508,16 +508,16 @@ static int is_duplicate_packet(struct ieee80211_device *ieee, ...@@ -508,16 +508,16 @@ static int is_duplicate_packet(struct ieee80211_device *ieee,
return 1; return 1;
} }
static bool AddReorderEntry(struct rx_ts_record *pTS, PRX_REORDER_ENTRY pReorderEntry) static bool AddReorderEntry(struct rx_ts_record *pTS, struct rx_reorder_entry *pReorderEntry)
{ {
struct list_head *pList = &pTS->rx_pending_pkt_list; struct list_head *pList = &pTS->rx_pending_pkt_list;
while(pList->next != &pTS->rx_pending_pkt_list) while(pList->next != &pTS->rx_pending_pkt_list)
{ {
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; 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; return false;
} }
...@@ -589,7 +589,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -589,7 +589,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
struct rx_ts_record *pTS, u16 SeqNum) struct rx_ts_record *pTS, u16 SeqNum)
{ {
PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
PRX_REORDER_ENTRY pReorderEntry = NULL; struct rx_reorder_entry *pReorderEntry = NULL;
struct ieee80211_rxb **prxbIndicateArray; struct ieee80211_rxb **prxbIndicateArray;
u8 WinSize = pHTInfo->RxReorderWinSize; u8 WinSize = pHTInfo->RxReorderWinSize;
u16 WinEnd = (pTS->rx_indicate_seq + WinSize - 1) % 4096; u16 WinEnd = (pTS->rx_indicate_seq + WinSize - 1) % 4096;
...@@ -663,7 +663,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -663,7 +663,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
/* Current packet is going to be inserted into pending list.*/ /* Current packet is going to be inserted into pending list.*/
//IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): We RX no ordered packed, insert to ordered list\n",__func__); //IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): We RX no ordered packed, insert to ordered list\n",__func__);
if(!list_empty(&ieee->RxReorder_Unused_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); list_del_init(&pReorderEntry->List);
/* Make a reorder entry and insert into a the packet list.*/ /* Make a reorder entry and insert into a the packet list.*/
...@@ -709,7 +709,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -709,7 +709,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
/* Check if there is any packet need indicate.*/ /* Check if there is any packet need indicate.*/
while(!list_empty(&pTS->rx_pending_pkt_list)) { while(!list_empty(&pTS->rx_pending_pkt_list)) {
IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): start RREORDER indicate\n",__func__); IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): start RREORDER indicate\n",__func__);
pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pTS->rx_pending_pkt_list.prev,RX_REORDER_ENTRY,List); pReorderEntry = (struct rx_reorder_entry *)list_entry(pTS->rx_pending_pkt_list.prev, struct rx_reorder_entry, List);
if (SN_LESS(pReorderEntry->SeqNum, pTS->rx_indicate_seq) || if (SN_LESS(pReorderEntry->SeqNum, pTS->rx_indicate_seq) ||
SN_EQUAL(pReorderEntry->SeqNum, pTS->rx_indicate_seq)) SN_EQUAL(pReorderEntry->SeqNum, pTS->rx_indicate_seq))
{ {
......
...@@ -28,7 +28,7 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -28,7 +28,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
struct rx_ts_record *pRxTs = from_timer(pRxTs, t, rx_pkt_pending_timer); struct rx_ts_record *pRxTs = from_timer(pRxTs, t, rx_pkt_pending_timer);
struct ieee80211_device *ieee = container_of(pRxTs, struct ieee80211_device, RxTsRecord[pRxTs->num]); struct ieee80211_device *ieee = container_of(pRxTs, struct ieee80211_device, RxTsRecord[pRxTs->num]);
PRX_REORDER_ENTRY pReorderEntry = NULL; struct rx_reorder_entry *pReorderEntry = NULL;
//u32 flags = 0; //u32 flags = 0;
unsigned long flags = 0; unsigned long flags = 0;
...@@ -40,7 +40,7 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -40,7 +40,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
if(pRxTs->rx_timeout_indicate_seq != 0xffff) { if(pRxTs->rx_timeout_indicate_seq != 0xffff) {
// Indicate the pending packets sequentially according to SeqNum until meet the gap. // Indicate the pending packets sequentially according to SeqNum until meet the gap.
while(!list_empty(&pRxTs->rx_pending_pkt_list)) { while(!list_empty(&pRxTs->rx_pending_pkt_list)) {
pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTs->rx_pending_pkt_list.prev, RX_REORDER_ENTRY, List); pReorderEntry = (struct rx_reorder_entry *)list_entry(pRxTs->rx_pending_pkt_list.prev, struct rx_reorder_entry, List);
if(index == 0) if(index == 0)
pRxTs->rx_indicate_seq = pReorderEntry->SeqNum; pRxTs->rx_indicate_seq = pReorderEntry->SeqNum;
...@@ -133,7 +133,7 @@ void TSInitialize(struct ieee80211_device *ieee) ...@@ -133,7 +133,7 @@ void TSInitialize(struct ieee80211_device *ieee)
{ {
struct tx_ts_record *pTxTS = ieee->TxTsRecord; struct tx_ts_record *pTxTS = ieee->TxTsRecord;
struct rx_ts_record *pRxTS = ieee->RxTsRecord; struct rx_ts_record *pRxTS = ieee->RxTsRecord;
PRX_REORDER_ENTRY pRxReorderEntry = ieee->RxReorderEntry; struct rx_reorder_entry *pRxReorderEntry = ieee->RxReorderEntry;
u8 count = 0; u8 count = 0;
IEEE80211_DEBUG(IEEE80211_DL_TS, "==========>%s()\n", __func__); IEEE80211_DEBUG(IEEE80211_DL_TS, "==========>%s()\n", __func__);
// Initialize Tx TS related info. // Initialize Tx TS related info.
...@@ -418,7 +418,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info * ...@@ -418,7 +418,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *
if(TxRxSelect == RX_DIR) { if(TxRxSelect == RX_DIR) {
//#ifdef TO_DO_LIST //#ifdef TO_DO_LIST
PRX_REORDER_ENTRY pRxReorderEntry; struct rx_reorder_entry *pRxReorderEntry;
struct rx_ts_record *pRxTS = (struct rx_ts_record *)pTs; struct rx_ts_record *pRxTS = (struct rx_ts_record *)pTs;
if(timer_pending(&pRxTS->rx_pkt_pending_timer)) if(timer_pending(&pRxTS->rx_pkt_pending_timer))
del_timer_sync(&pRxTS->rx_pkt_pending_timer); del_timer_sync(&pRxTS->rx_pkt_pending_timer);
...@@ -426,7 +426,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info * ...@@ -426,7 +426,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *
while(!list_empty(&pRxTS->rx_pending_pkt_list)) { while(!list_empty(&pRxTS->rx_pending_pkt_list)) {
spin_lock_irqsave(&(ieee->reorder_spinlock), flags); spin_lock_irqsave(&(ieee->reorder_spinlock), flags);
//pRxReorderEntry = list_entry(&pRxTS->rx_pending_pkt_list.prev,RX_REORDER_ENTRY,List); //pRxReorderEntry = list_entry(&pRxTS->rx_pending_pkt_list.prev,RX_REORDER_ENTRY,List);
pRxReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTS->rx_pending_pkt_list.prev, RX_REORDER_ENTRY, List); pRxReorderEntry = (struct rx_reorder_entry *)list_entry(pRxTS->rx_pending_pkt_list.prev, struct rx_reorder_entry, List);
list_del_init(&pRxReorderEntry->List); list_del_init(&pRxReorderEntry->List);
{ {
int i = 0; int i = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment