Commit 11fe57be authored by Tree Davies's avatar Tree Davies Committed by Greg Kroah-Hartman

Staging: rtl8192e: Rename variable TxPendingBARecord

Rename variable TxPendingBARecord to tx_pending_ba_record to fix checkpatch
warning Avoid CamelCase.
Signed-off-by: default avatarTree Davies <tdavies@darkphysics.net>
Link: https://lore.kernel.org/r/20231127054305.148276-7-tdavies@darkphysics.netSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56c5fa92
...@@ -26,7 +26,7 @@ static void deactivate_ba_entry(struct rtllib_device *ieee, struct ba_record *ba ...@@ -26,7 +26,7 @@ static void deactivate_ba_entry(struct rtllib_device *ieee, struct ba_record *ba
static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *ts) static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *ts)
{ {
struct ba_record *admitted_ba = &ts->tx_admitted_ba_record; struct ba_record *admitted_ba = &ts->tx_admitted_ba_record;
struct ba_record *pending_ba = &ts->TxPendingBARecord; struct ba_record *pending_ba = &ts->tx_pending_ba_record;
u8 send_del_ba = false; u8 send_del_ba = false;
if (pending_ba->b_valid) { if (pending_ba->b_valid) {
...@@ -345,7 +345,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -345,7 +345,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
} }
ts->add_ba_req_in_progress = false; ts->add_ba_req_in_progress = false;
pending_ba = &ts->TxPendingBARecord; pending_ba = &ts->tx_pending_ba_record;
pAdmittedBA = &ts->tx_admitted_ba_record; pAdmittedBA = &ts->tx_admitted_ba_record;
if (pAdmittedBA->b_valid) { if (pAdmittedBA->b_valid) {
...@@ -464,7 +464,7 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -464,7 +464,7 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb)
void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *ts, void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *ts,
u8 policy, u8 overwrite_pending) u8 policy, u8 overwrite_pending)
{ {
struct ba_record *ba = &ts->TxPendingBARecord; struct ba_record *ba = &ts->tx_pending_ba_record;
if (ba->b_valid && !overwrite_pending) if (ba->b_valid && !overwrite_pending)
return; return;
...@@ -496,7 +496,7 @@ void rtllib_ts_init_del_ba(struct rtllib_device *ieee, ...@@ -496,7 +496,7 @@ void rtllib_ts_init_del_ba(struct rtllib_device *ieee,
rtllib_send_DELBA(ieee, pTsCommonInfo->addr, rtllib_send_DELBA(ieee, pTsCommonInfo->addr,
(ts->tx_admitted_ba_record.b_valid) ? (ts->tx_admitted_ba_record.b_valid) ?
(&ts->tx_admitted_ba_record) : (&ts->tx_admitted_ba_record) :
(&ts->TxPendingBARecord), (&ts->tx_pending_ba_record),
TxRxSelect, DELBA_REASON_END_BA); TxRxSelect, DELBA_REASON_END_BA);
} else if (TxRxSelect == RX_DIR) { } else if (TxRxSelect == RX_DIR) {
struct rx_ts_record *ts = struct rx_ts_record *ts =
...@@ -511,11 +511,11 @@ void rtllib_ts_init_del_ba(struct rtllib_device *ieee, ...@@ -511,11 +511,11 @@ void rtllib_ts_init_del_ba(struct rtllib_device *ieee,
void rtllib_ba_setup_timeout(struct timer_list *t) void rtllib_ba_setup_timeout(struct timer_list *t)
{ {
struct tx_ts_record *ts = from_timer(ts, t, struct tx_ts_record *ts = from_timer(ts, t,
TxPendingBARecord.timer); tx_pending_ba_record.timer);
ts->add_ba_req_in_progress = false; ts->add_ba_req_in_progress = false;
ts->add_ba_req_delayed = true; ts->add_ba_req_delayed = true;
ts->TxPendingBARecord.b_valid = false; ts->tx_pending_ba_record.b_valid = false;
} }
void rtllib_tx_ba_inact_timeout(struct timer_list *t) void rtllib_tx_ba_inact_timeout(struct timer_list *t)
......
...@@ -25,7 +25,7 @@ struct ts_common_info { ...@@ -25,7 +25,7 @@ struct ts_common_info {
struct tx_ts_record { struct tx_ts_record {
struct ts_common_info TsCommonInfo; struct ts_common_info TsCommonInfo;
u16 TxCurSeq; u16 TxCurSeq;
struct ba_record TxPendingBARecord; struct ba_record tx_pending_ba_record;
struct ba_record tx_admitted_ba_record; struct ba_record tx_admitted_ba_record;
u8 add_ba_req_in_progress; u8 add_ba_req_in_progress;
u8 add_ba_req_delayed; u8 add_ba_req_delayed;
......
...@@ -106,7 +106,7 @@ static void ResetTxTsEntry(struct tx_ts_record *ts) ...@@ -106,7 +106,7 @@ static void ResetTxTsEntry(struct tx_ts_record *ts)
ts->using_ba = false; ts->using_ba = false;
ts->disable_add_ba = false; ts->disable_add_ba = false;
rtllib_reset_ba_entry(&ts->tx_admitted_ba_record); rtllib_reset_ba_entry(&ts->tx_admitted_ba_record);
rtllib_reset_ba_entry(&ts->TxPendingBARecord); rtllib_reset_ba_entry(&ts->tx_pending_ba_record);
} }
static void ResetRxTsEntry(struct rx_ts_record *ts) static void ResetRxTsEntry(struct rx_ts_record *ts)
...@@ -132,7 +132,7 @@ void rtllib_ts_init(struct rtllib_device *ieee) ...@@ -132,7 +132,7 @@ void rtllib_ts_init(struct rtllib_device *ieee)
pTxTS->num = count; pTxTS->num = count;
timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0); timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0);
timer_setup(&pTxTS->TxPendingBARecord.timer, rtllib_ba_setup_timeout, timer_setup(&pTxTS->tx_pending_ba_record.timer, rtllib_ba_setup_timeout,
0); 0);
timer_setup(&pTxTS->tx_admitted_ba_record.timer, timer_setup(&pTxTS->tx_admitted_ba_record.timer,
rtllib_tx_ba_inact_timeout, 0); rtllib_tx_ba_inact_timeout, 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