From: Tree Davies <tdavies@darkphysics.net>
To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Tree Davies <tdavies@darkphysics.net>
Subject: [PATCH 05/15] Staging: rtl8192e: Rename variable TxAdmittedBARecord
Date: Sun, 26 Nov 2023 21:42:55 -0800 [thread overview]
Message-ID: <20231127054305.148276-6-tdavies@darkphysics.net> (raw)
In-Reply-To: <20231127054305.148276-1-tdavies@darkphysics.net>
Rename variable TxAdmittedBARecord to tx_admitted_ba_record to fix checkpatch
warning Avoid CamelCase.
Signed-off-by: Tree Davies <tdavies@darkphysics.net>
---
drivers/staging/rtl8192e/rtl819x_BAProc.c | 12 ++++++------
drivers/staging/rtl8192e/rtl819x_TS.h | 2 +-
drivers/staging/rtl8192e/rtl819x_TSProc.c | 4 ++--
drivers/staging/rtl8192e/rtllib_tx.c | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c
index bf8d42668990..db529559592b 100644
--- a/drivers/staging/rtl8192e/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c
@@ -25,7 +25,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)
{
- struct ba_record *admitted_ba = &ts->TxAdmittedBARecord;
+ struct ba_record *admitted_ba = &ts->tx_admitted_ba_record;
struct ba_record *pending_ba = &ts->TxPendingBARecord;
u8 send_del_ba = false;
@@ -346,7 +346,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
ts->add_ba_req_in_progress = false;
pending_ba = &ts->TxPendingBARecord;
- pAdmittedBA = &ts->TxAdmittedBARecord;
+ pAdmittedBA = &ts->tx_admitted_ba_record;
if (pAdmittedBA->b_valid) {
netdev_dbg(ieee->dev, "%s(): ADDBA response already admitted\n",
@@ -494,8 +494,8 @@ void rtllib_ts_init_del_ba(struct rtllib_device *ieee,
if (tx_ts_delete_ba(ieee, ts))
rtllib_send_DELBA(ieee, pTsCommonInfo->addr,
- (ts->TxAdmittedBARecord.b_valid) ?
- (&ts->TxAdmittedBARecord) :
+ (ts->tx_admitted_ba_record.b_valid) ?
+ (&ts->tx_admitted_ba_record) :
(&ts->TxPendingBARecord),
TxRxSelect, DELBA_REASON_END_BA);
} else if (TxRxSelect == RX_DIR) {
@@ -521,12 +521,12 @@ void rtllib_ba_setup_timeout(struct timer_list *t)
void rtllib_tx_ba_inact_timeout(struct timer_list *t)
{
struct tx_ts_record *ts = from_timer(ts, t,
- TxAdmittedBARecord.timer);
+ tx_admitted_ba_record.timer);
struct rtllib_device *ieee = container_of(ts, struct rtllib_device,
TxTsRecord[ts->num]);
tx_ts_delete_ba(ieee, ts);
rtllib_send_DELBA(ieee, ts->TsCommonInfo.addr,
- &ts->TxAdmittedBARecord, TX_DIR,
+ &ts->tx_admitted_ba_record, TX_DIR,
DELBA_REASON_TIMEOUT);
}
diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl8192e/rtl819x_TS.h
index f2bd53268e3a..40b0ed4fefaf 100644
--- a/drivers/staging/rtl8192e/rtl819x_TS.h
+++ b/drivers/staging/rtl8192e/rtl819x_TS.h
@@ -26,7 +26,7 @@ struct tx_ts_record {
struct ts_common_info TsCommonInfo;
u16 TxCurSeq;
struct ba_record TxPendingBARecord;
- struct ba_record TxAdmittedBARecord;
+ struct ba_record tx_admitted_ba_record;
u8 add_ba_req_in_progress;
u8 add_ba_req_delayed;
u8 using_ba;
diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
index 039f070aadd1..0e59a3155c4a 100644
--- a/drivers/staging/rtl8192e/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -105,7 +105,7 @@ static void ResetTxTsEntry(struct tx_ts_record *ts)
ts->add_ba_req_delayed = false;
ts->using_ba = false;
ts->disable_add_ba = false;
- rtllib_reset_ba_entry(&ts->TxAdmittedBARecord);
+ rtllib_reset_ba_entry(&ts->tx_admitted_ba_record);
rtllib_reset_ba_entry(&ts->TxPendingBARecord);
}
@@ -134,7 +134,7 @@ void rtllib_ts_init(struct rtllib_device *ieee)
timer_setup(&pTxTS->TxPendingBARecord.timer, rtllib_ba_setup_timeout,
0);
- timer_setup(&pTxTS->TxAdmittedBARecord.timer,
+ timer_setup(&pTxTS->tx_admitted_ba_record.timer,
rtllib_tx_ba_inact_timeout, 0);
ResetTxTsEntry(pTxTS);
diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 2ef617a55995..51a8286abd18 100644
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -294,7 +294,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
netdev_info(ieee->dev, "%s: can't get TS\n", __func__);
return;
}
- if (!ts->TxAdmittedBARecord.b_valid) {
+ if (!ts->tx_admitted_ba_record.b_valid) {
if (ieee->wpa_ie_len && (ieee->pairwise_key_type ==
KEY_TYPE_NA)) {
;
@@ -305,7 +305,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
}
goto FORCED_AGG_SETTING;
} else if (!ts->using_ba) {
- if (SN_LESS(ts->TxAdmittedBARecord.ba_start_seq_ctrl.field.seq_num,
+ if (SN_LESS(ts->tx_admitted_ba_record.ba_start_seq_ctrl.field.seq_num,
(ts->TxCurSeq + 1) % 4096))
ts->using_ba = true;
else
--
2.39.2
next prev parent reply other threads:[~2023-11-27 5:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-27 5:42 [PATCH 00/15] Staging: rtl8192e: Rename CamelCase vars Tree Davies
2023-11-27 5:42 ` [PATCH 01/15] Staging: rtl8192e: Rename variable pTxTs Tree Davies
2023-11-27 5:42 ` [PATCH 02/15] Staging: rtl8192e: Rename variable BAReq Tree Davies
2023-11-27 5:42 ` [PATCH 03/15] Staging: rtl8192e: Rename variable Delba Tree Davies
2023-11-27 5:42 ` [PATCH 04/15] Staging: rtl8192e: Rename variable TSpec Tree Davies
2023-11-27 5:42 ` Tree Davies [this message]
2023-11-27 5:42 ` [PATCH 06/15] Staging: rtl8192e: Rename variable TxPendingBARecord Tree Davies
2023-11-27 5:42 ` [PATCH 07/15] Staging: rtl8192e: Rename variable pDialogToken Tree Davies
2023-11-27 5:42 ` [PATCH 08/15] Staging: rtl8192e: Rename variable pTsCommonInfo Tree Davies
2023-11-27 5:42 ` [PATCH 09/15] Staging: rtl8192e: Rename variable TxCurSeq Tree Davies
2023-11-27 5:43 ` [PATCH 10/15] Staging: rtl8192e: Rename variable TsAddBaTimer Tree Davies
2023-11-27 5:43 ` [PATCH 11/15] Staging: rtl8192e: Rename variable DelbaParamSet Tree Davies
2023-11-27 5:43 ` [PATCH 12/15] Staging: rtl8192e: Rename variable pBaParamSet Tree Davies
2023-11-27 5:43 ` [PATCH 13/15] Staging: rtl8192e: Rename variable pBaTimeoutVal Tree Davies
2023-11-27 5:43 ` [PATCH 14/15] Staging: rtl8192e: Rename variable pAdmittedBA Tree Davies
2023-11-27 5:43 ` [PATCH 15/15] Staging: rtl8192e: Rename variable TsCommonInfo Tree Davies
2023-11-27 19:49 ` [PATCH 00/15] Staging: rtl8192e: Rename CamelCase vars Philipp Hortmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231127054305.148276-6-tdavies@darkphysics.net \
--to=tdavies@darkphysics.net \
--cc=anjan@momi.ca \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=philipp.g.hortmann@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox