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

staging:rtl8192u: Rename TxAdmittedBARecord - Style

Rename the member variable TxAdmittedBARecord to tx_admitted_ba_record
This change clears the checkpatch issue with CamelCase naming.

The resulting changes are purely coding style changes which should not
impact runtime code execution.
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 43a420e3
...@@ -335,14 +335,14 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee, ...@@ -335,14 +335,14 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee,
printk("===>can't get TS\n"); printk("===>can't get TS\n");
return; return;
} }
if (!pTxTs->TxAdmittedBARecord.bValid) if (!pTxTs->tx_admitted_ba_record.bValid)
{ {
TsStartAddBaProcess(ieee, pTxTs); TsStartAddBaProcess(ieee, pTxTs);
goto FORCED_AGG_SETTING; goto FORCED_AGG_SETTING;
} }
else if (!pTxTs->bUsingBa) else if (!pTxTs->bUsingBa)
{ {
if (SN_LESS(pTxTs->TxAdmittedBARecord.BaStartSeqCtrl.field.SeqNum, (pTxTs->tx_cur_seq + 1) % 4096)) if (SN_LESS(pTxTs->tx_admitted_ba_record.BaStartSeqCtrl.field.SeqNum, (pTxTs->tx_cur_seq + 1) % 4096))
pTxTs->bUsingBa = true; pTxTs->bUsingBa = true;
else else
goto FORCED_AGG_SETTING; goto FORCED_AGG_SETTING;
......
...@@ -42,7 +42,7 @@ static void DeActivateBAEntry(struct ieee80211_device *ieee, PBA_RECORD pBA) ...@@ -42,7 +42,7 @@ static void DeActivateBAEntry(struct ieee80211_device *ieee, PBA_RECORD pBA)
********************************************************************************************************************/ ********************************************************************************************************************/
static u8 TxTsDeleteBA(struct ieee80211_device *ieee, struct tx_ts_record *pTxTs) static u8 TxTsDeleteBA(struct ieee80211_device *ieee, struct tx_ts_record *pTxTs)
{ {
PBA_RECORD pAdmittedBa = &pTxTs->TxAdmittedBARecord; //These two BA entries must exist in TS structure PBA_RECORD pAdmittedBa = &pTxTs->tx_admitted_ba_record; //These two BA entries must exist in TS structure
PBA_RECORD pPendingBa = &pTxTs->tx_pending_ba_record; PBA_RECORD pPendingBa = &pTxTs->tx_pending_ba_record;
u8 bSendDELBA = false; u8 bSendDELBA = false;
...@@ -471,7 +471,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -471,7 +471,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
pTS->bAddBaReqInProgress = false; pTS->bAddBaReqInProgress = false;
pPendingBA = &pTS->tx_pending_ba_record; pPendingBA = &pTS->tx_pending_ba_record;
pAdmittedBA = &pTS->TxAdmittedBARecord; pAdmittedBA = &pTS->tx_admitted_ba_record;
// //
...@@ -647,7 +647,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo, ...@@ -647,7 +647,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo,
ieee80211_send_DELBA( ieee80211_send_DELBA(
ieee, ieee,
pTsCommonInfo->addr, pTsCommonInfo->addr,
(pTxTs->TxAdmittedBARecord.bValid)?(&pTxTs->TxAdmittedBARecord):(&pTxTs->tx_pending_ba_record), (pTxTs->tx_admitted_ba_record.bValid)?(&pTxTs->tx_admitted_ba_record):(&pTxTs->tx_pending_ba_record),
TxRxSelect, TxRxSelect,
DELBA_REASON_END_BA); DELBA_REASON_END_BA);
} else if (TxRxSelect == RX_DIR) { } else if (TxRxSelect == RX_DIR) {
...@@ -678,13 +678,13 @@ void BaSetupTimeOut(struct timer_list *t) ...@@ -678,13 +678,13 @@ void BaSetupTimeOut(struct timer_list *t)
void TxBaInactTimeout(struct timer_list *t) void TxBaInactTimeout(struct timer_list *t)
{ {
struct tx_ts_record *pTxTs = from_timer(pTxTs, t, TxAdmittedBARecord.Timer); struct tx_ts_record *pTxTs = from_timer(pTxTs, t, tx_admitted_ba_record.Timer);
struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[pTxTs->num]); struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[pTxTs->num]);
TxTsDeleteBA(ieee, pTxTs); TxTsDeleteBA(ieee, pTxTs);
ieee80211_send_DELBA( ieee80211_send_DELBA(
ieee, ieee,
pTxTs->ts_common_info.addr, pTxTs->ts_common_info.addr,
&pTxTs->TxAdmittedBARecord, &pTxTs->tx_admitted_ba_record,
TX_DIR, TX_DIR,
DELBA_REASON_TIMEOUT); DELBA_REASON_TIMEOUT);
} }
......
...@@ -30,7 +30,7 @@ struct tx_ts_record { ...@@ -30,7 +30,7 @@ struct tx_ts_record {
struct ts_common_info ts_common_info; struct ts_common_info ts_common_info;
u16 tx_cur_seq; u16 tx_cur_seq;
BA_RECORD tx_pending_ba_record; /* For BA Originator */ BA_RECORD tx_pending_ba_record; /* For BA Originator */
BA_RECORD TxAdmittedBARecord; /* For BA Originator */ BA_RECORD tx_admitted_ba_record; /* For BA Originator */
/* QOS_DL_RECORD DLRecord; */ /* QOS_DL_RECORD DLRecord; */
u8 bAddBaReqInProgress; u8 bAddBaReqInProgress;
u8 bAddBaReqDelayed; u8 bAddBaReqDelayed;
......
...@@ -117,7 +117,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS) ...@@ -117,7 +117,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS)
pTS->bAddBaReqInProgress = false; pTS->bAddBaReqInProgress = false;
pTS->bAddBaReqDelayed = false; pTS->bAddBaReqDelayed = false;
pTS->bUsingBa = false; pTS->bUsingBa = false;
ResetBaEntry(&pTS->TxAdmittedBARecord); //For BA Originator ResetBaEntry(&pTS->tx_admitted_ba_record); //For BA Originator
ResetBaEntry(&pTS->tx_pending_ba_record); ResetBaEntry(&pTS->tx_pending_ba_record);
} }
...@@ -153,7 +153,7 @@ void TSInitialize(struct ieee80211_device *ieee) ...@@ -153,7 +153,7 @@ void TSInitialize(struct ieee80211_device *ieee)
timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0); timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0);
timer_setup(&pTxTS->tx_pending_ba_record.Timer, BaSetupTimeOut, timer_setup(&pTxTS->tx_pending_ba_record.Timer, BaSetupTimeOut,
0); 0);
timer_setup(&pTxTS->TxAdmittedBARecord.Timer, timer_setup(&pTxTS->tx_admitted_ba_record.Timer,
TxBaInactTimeout, 0); TxBaInactTimeout, 0);
ResetTxTsEntry(pTxTS); ResetTxTsEntry(pTxTS);
list_add_tail(&pTxTS->ts_common_info.list, &ieee->Tx_TS_Unused_List); list_add_tail(&pTxTS->ts_common_info.list, &ieee->Tx_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