Commit d48cc3c3 authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman

staging:rtl8192u: Rename List > list - Coding style

In struct TS_COMMON_INFO rename the member List to list. This clears the
checkpatch issue concerning CamelCase naming of variables.
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ae62698
...@@ -16,7 +16,7 @@ enum tr_select { ...@@ -16,7 +16,7 @@ enum tr_select {
}; };
struct ts_common_info { struct ts_common_info {
struct list_head List; struct list_head list;
struct timer_list SetupTimer; struct timer_list SetupTimer;
struct timer_list InactTimer; struct timer_list InactTimer;
u8 Addr[6]; u8 Addr[6];
......
...@@ -156,7 +156,7 @@ void TSInitialize(struct ieee80211_device *ieee) ...@@ -156,7 +156,7 @@ void TSInitialize(struct ieee80211_device *ieee)
timer_setup(&pTxTS->TxAdmittedBARecord.Timer, timer_setup(&pTxTS->TxAdmittedBARecord.Timer,
TxBaInactTimeout, 0); TxBaInactTimeout, 0);
ResetTxTsEntry(pTxTS); ResetTxTsEntry(pTxTS);
list_add_tail(&pTxTS->TsCommonInfo.List, &ieee->Tx_TS_Unused_List); list_add_tail(&pTxTS->TsCommonInfo.list, &ieee->Tx_TS_Unused_List);
pTxTS++; pTxTS++;
} }
...@@ -175,7 +175,7 @@ void TSInitialize(struct ieee80211_device *ieee) ...@@ -175,7 +175,7 @@ void TSInitialize(struct ieee80211_device *ieee)
RxBaInactTimeout, 0); RxBaInactTimeout, 0);
timer_setup(&pRxTS->RxPktPendingTimer, RxPktPendingTimeout, 0); timer_setup(&pRxTS->RxPktPendingTimer, RxPktPendingTimeout, 0);
ResetRxTsEntry(pRxTS); ResetRxTsEntry(pRxTS);
list_add_tail(&pRxTS->TsCommonInfo.List, &ieee->Rx_TS_Unused_List); list_add_tail(&pRxTS->TsCommonInfo.list, &ieee->Rx_TS_Unused_List);
pRxTS++; pRxTS++;
} }
// Initialize unused Rx Reorder List. // Initialize unused Rx Reorder List.
...@@ -245,7 +245,7 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee, ...@@ -245,7 +245,7 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee,
for(dir = 0; dir <= DIR_BI_DIR; dir++) { for(dir = 0; dir <= DIR_BI_DIR; dir++) {
if (!search_dir[dir]) if (!search_dir[dir])
continue; continue;
list_for_each_entry(pRet, psearch_list, List){ list_for_each_entry(pRet, psearch_list, list){
// IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:%pM, TID:%d, dir:%d\n", pRet->Addr, pRet->TSpec.f.TSInfo.field.ucTSID, pRet->TSpec.f.TSInfo.field.ucDirection); // IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:%pM, TID:%d, dir:%d\n", pRet->Addr, pRet->TSpec.f.TSInfo.field.ucTSID, pRet->TSpec.f.TSInfo.field.ucDirection);
if (memcmp(pRet->Addr, Addr, 6) == 0) if (memcmp(pRet->Addr, Addr, 6) == 0)
if (pRet->TSpec.f.TSInfo.field.ucTSID == TID) if (pRet->TSpec.f.TSInfo.field.ucTSID == TID)
...@@ -254,11 +254,11 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee, ...@@ -254,11 +254,11 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee,
break; break;
} }
} }
if(&pRet->List != psearch_list) if(&pRet->list != psearch_list)
break; break;
} }
if(&pRet->List != psearch_list) if(&pRet->list != psearch_list)
return pRet ; return pRet ;
else else
return NULL; return NULL;
...@@ -371,8 +371,8 @@ bool GetTs( ...@@ -371,8 +371,8 @@ bool GetTs(
((TxRxSelect==TX_DIR)?DIR_UP:DIR_DOWN); ((TxRxSelect==TX_DIR)?DIR_UP:DIR_DOWN);
IEEE80211_DEBUG(IEEE80211_DL_TS, "to add Ts\n"); IEEE80211_DEBUG(IEEE80211_DL_TS, "to add Ts\n");
if(!list_empty(pUnusedList)) { if(!list_empty(pUnusedList)) {
(*ppTS) = list_entry(pUnusedList->next, struct ts_common_info, List); (*ppTS) = list_entry(pUnusedList->next, struct ts_common_info, list);
list_del_init(&(*ppTS)->List); list_del_init(&(*ppTS)->list);
if(TxRxSelect==TX_DIR) { if(TxRxSelect==TX_DIR) {
PTX_TS_RECORD tmp = container_of(*ppTS, TX_TS_RECORD, TsCommonInfo); PTX_TS_RECORD tmp = container_of(*ppTS, TX_TS_RECORD, TsCommonInfo);
ResetTxTsEntry(tmp); ResetTxTsEntry(tmp);
...@@ -395,7 +395,7 @@ bool GetTs( ...@@ -395,7 +395,7 @@ bool GetTs(
MakeTSEntry(*ppTS, Addr, &TSpec, NULL, 0, 0); MakeTSEntry(*ppTS, Addr, &TSpec, NULL, 0, 0);
AdmitTS(ieee, *ppTS, 0); AdmitTS(ieee, *ppTS, 0);
list_add_tail(&((*ppTS)->List), pAddmitList); list_add_tail(&((*ppTS)->list), pAddmitList);
// if there is DirectLink, we need to do additional operation here!! // if there is DirectLink, we need to do additional operation here!!
return true; return true;
...@@ -457,36 +457,36 @@ void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr) ...@@ -457,36 +457,36 @@ void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr)
struct ts_common_info *pTS, *pTmpTS; struct ts_common_info *pTS, *pTmpTS;
printk("===========>RemovePeerTS,%pM\n", Addr); printk("===========>RemovePeerTS,%pM\n", Addr);
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) { list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, list) {
if (memcmp(pTS->Addr, Addr, 6) == 0) { if (memcmp(pTS->Addr, Addr, 6) == 0) {
RemoveTsEntry(ieee, pTS, TX_DIR); RemoveTsEntry(ieee, pTS, TX_DIR);
list_del_init(&pTS->List); list_del_init(&pTS->list);
list_add_tail(&pTS->List, &ieee->Tx_TS_Unused_List); list_add_tail(&pTS->list, &ieee->Tx_TS_Unused_List);
} }
} }
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Admit_List, List) { list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Admit_List, list) {
if (memcmp(pTS->Addr, Addr, 6) == 0) { if (memcmp(pTS->Addr, Addr, 6) == 0) {
printk("====>remove Tx_TS_admin_list\n"); printk("====>remove Tx_TS_admin_list\n");
RemoveTsEntry(ieee, pTS, TX_DIR); RemoveTsEntry(ieee, pTS, TX_DIR);
list_del_init(&pTS->List); list_del_init(&pTS->list);
list_add_tail(&pTS->List, &ieee->Tx_TS_Unused_List); list_add_tail(&pTS->list, &ieee->Tx_TS_Unused_List);
} }
} }
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Pending_List, List) { list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Pending_List, list) {
if (memcmp(pTS->Addr, Addr, 6) == 0) { if (memcmp(pTS->Addr, Addr, 6) == 0) {
RemoveTsEntry(ieee, pTS, RX_DIR); RemoveTsEntry(ieee, pTS, RX_DIR);
list_del_init(&pTS->List); list_del_init(&pTS->list);
list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List); list_add_tail(&pTS->list, &ieee->Rx_TS_Unused_List);
} }
} }
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Admit_List, List) { list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Admit_List, list) {
if (memcmp(pTS->Addr, Addr, 6) == 0) { if (memcmp(pTS->Addr, Addr, 6) == 0) {
RemoveTsEntry(ieee, pTS, RX_DIR); RemoveTsEntry(ieee, pTS, RX_DIR);
list_del_init(&pTS->List); list_del_init(&pTS->list);
list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List); list_add_tail(&pTS->list, &ieee->Rx_TS_Unused_List);
} }
} }
} }
...@@ -495,28 +495,28 @@ void RemoveAllTS(struct ieee80211_device *ieee) ...@@ -495,28 +495,28 @@ void RemoveAllTS(struct ieee80211_device *ieee)
{ {
struct ts_common_info *pTS, *pTmpTS; struct ts_common_info *pTS, *pTmpTS;
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) { list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, list) {
RemoveTsEntry(ieee, pTS, TX_DIR); RemoveTsEntry(ieee, pTS, TX_DIR);
list_del_init(&pTS->List); list_del_init(&pTS->list);
list_add_tail(&pTS->List, &ieee->Tx_TS_Unused_List); list_add_tail(&pTS->list, &ieee->Tx_TS_Unused_List);
} }
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Admit_List, List) { list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Admit_List, list) {
RemoveTsEntry(ieee, pTS, TX_DIR); RemoveTsEntry(ieee, pTS, TX_DIR);
list_del_init(&pTS->List); list_del_init(&pTS->list);
list_add_tail(&pTS->List, &ieee->Tx_TS_Unused_List); list_add_tail(&pTS->list, &ieee->Tx_TS_Unused_List);
} }
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Pending_List, List) { list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Pending_List, list) {
RemoveTsEntry(ieee, pTS, RX_DIR); RemoveTsEntry(ieee, pTS, RX_DIR);
list_del_init(&pTS->List); list_del_init(&pTS->list);
list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List); list_add_tail(&pTS->list, &ieee->Rx_TS_Unused_List);
} }
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Admit_List, List) { list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Admit_List, list) {
RemoveTsEntry(ieee, pTS, RX_DIR); RemoveTsEntry(ieee, pTS, RX_DIR);
list_del_init(&pTS->List); list_del_init(&pTS->list);
list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List); list_add_tail(&pTS->list, &ieee->Rx_TS_Unused_List);
} }
} }
......
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