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

staging:rtl8192u: Rename RxAdmittedBARecord - Style

Rename the member variable RxAdmittedBARecord to rx_admitted_ba_record.
This change clears the checkpatch issue with CamelCase naming.

The resulting changes are coding style in nature and as such should have
no impact on runtime code execution.
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5b76f8cb
...@@ -70,7 +70,7 @@ static u8 TxTsDeleteBA(struct ieee80211_device *ieee, struct tx_ts_record *pTxTs ...@@ -70,7 +70,7 @@ static u8 TxTsDeleteBA(struct ieee80211_device *ieee, struct tx_ts_record *pTxTs
********************************************************************************************************************/ ********************************************************************************************************************/
static u8 RxTsDeleteBA(struct ieee80211_device *ieee, struct rx_ts_record *pRxTs) static u8 RxTsDeleteBA(struct ieee80211_device *ieee, struct rx_ts_record *pRxTs)
{ {
PBA_RECORD pBa = &pRxTs->RxAdmittedBARecord; PBA_RECORD pBa = &pRxTs->rx_admitted_ba_record;
u8 bSendDELBA = false; u8 bSendDELBA = false;
if (pBa->bValid) { if (pBa->bValid) {
...@@ -369,7 +369,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -369,7 +369,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS in %s()\n", __func__); IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS in %s()\n", __func__);
goto OnADDBAReq_Fail; goto OnADDBAReq_Fail;
} }
pBA = &pTS->RxAdmittedBARecord; pBA = &pTS->rx_admitted_ba_record;
// To Determine the ADDBA Req content // To Determine the ADDBA Req content
// We can do much more check here, including BufferSize, AMSDU_Support, Policy, StartSeqCtrl... // We can do much more check here, including BufferSize, AMSDU_Support, Policy, StartSeqCtrl...
// I want to check StartSeqCtrl to make sure when we start aggregation!!! // I want to check StartSeqCtrl to make sure when we start aggregation!!!
...@@ -656,7 +656,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo, ...@@ -656,7 +656,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo,
ieee80211_send_DELBA( ieee80211_send_DELBA(
ieee, ieee,
pTsCommonInfo->addr, pTsCommonInfo->addr,
&pRxTs->RxAdmittedBARecord, &pRxTs->rx_admitted_ba_record,
TxRxSelect, TxRxSelect,
DELBA_REASON_END_BA); DELBA_REASON_END_BA);
} }
...@@ -691,14 +691,14 @@ void TxBaInactTimeout(struct timer_list *t) ...@@ -691,14 +691,14 @@ void TxBaInactTimeout(struct timer_list *t)
void RxBaInactTimeout(struct timer_list *t) void RxBaInactTimeout(struct timer_list *t)
{ {
struct rx_ts_record *pRxTs = from_timer(pRxTs, t, RxAdmittedBARecord.Timer); struct rx_ts_record *pRxTs = from_timer(pRxTs, t, rx_admitted_ba_record.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]);
RxTsDeleteBA(ieee, pRxTs); RxTsDeleteBA(ieee, pRxTs);
ieee80211_send_DELBA( ieee80211_send_DELBA(
ieee, ieee,
pRxTs->ts_common_info.addr, pRxTs->ts_common_info.addr,
&pRxTs->RxAdmittedBARecord, &pRxTs->rx_admitted_ba_record,
RX_DIR, RX_DIR,
DELBA_REASON_TIMEOUT); DELBA_REASON_TIMEOUT);
} }
...@@ -43,7 +43,7 @@ struct rx_ts_record { ...@@ -43,7 +43,7 @@ struct rx_ts_record {
u16 rx_timeout_indicate_seq; u16 rx_timeout_indicate_seq;
struct list_head rx_pending_pkt_list; struct list_head rx_pending_pkt_list;
struct timer_list rx_pkt_pending_timer; struct timer_list rx_pkt_pending_timer;
BA_RECORD RxAdmittedBARecord; /* For BA Recipient */ BA_RECORD rx_admitted_ba_record; /* For BA Recipient */
u16 RxLastSeqNum; u16 RxLastSeqNum;
u8 RxLastFragNum; u8 RxLastFragNum;
u8 num; u8 num;
......
...@@ -126,7 +126,7 @@ static void ResetRxTsEntry(struct rx_ts_record *pTS) ...@@ -126,7 +126,7 @@ static void ResetRxTsEntry(struct rx_ts_record *pTS)
ResetTsCommonInfo(&pTS->ts_common_info); ResetTsCommonInfo(&pTS->ts_common_info);
pTS->rx_indicate_seq = 0xffff; // This indicate the rx_indicate_seq is not used now!! pTS->rx_indicate_seq = 0xffff; // This indicate the rx_indicate_seq is not used now!!
pTS->rx_timeout_indicate_seq = 0xffff; // This indicate the rx_timeout_indicate_seq is not used now!! pTS->rx_timeout_indicate_seq = 0xffff; // This indicate the rx_timeout_indicate_seq is not used now!!
ResetBaEntry(&pTS->RxAdmittedBARecord); // For BA Recipient ResetBaEntry(&pTS->rx_admitted_ba_record); // For BA Recipient
} }
void TSInitialize(struct ieee80211_device *ieee) void TSInitialize(struct ieee80211_device *ieee)
...@@ -171,7 +171,7 @@ void TSInitialize(struct ieee80211_device *ieee) ...@@ -171,7 +171,7 @@ void TSInitialize(struct ieee80211_device *ieee)
0); 0);
timer_setup(&pRxTS->ts_common_info.inact_timer, TsInactTimeout, timer_setup(&pRxTS->ts_common_info.inact_timer, TsInactTimeout,
0); 0);
timer_setup(&pRxTS->RxAdmittedBARecord.Timer, timer_setup(&pRxTS->rx_admitted_ba_record.Timer,
RxBaInactTimeout, 0); RxBaInactTimeout, 0);
timer_setup(&pRxTS->rx_pkt_pending_timer, RxPktPendingTimeout, 0); timer_setup(&pRxTS->rx_pkt_pending_timer, RxPktPendingTimeout, 0);
ResetRxTsEntry(pRxTS); ResetRxTsEntry(pRxTS);
......
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