Commit 56c5fa92 authored by Tree Davies's avatar Tree Davies Committed by Greg Kroah-Hartman

Staging: rtl8192e: Rename variable TxAdmittedBARecord

Rename variable TxAdmittedBARecord to tx_admitted_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-6-tdavies@darkphysics.netSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b35fe92f
......@@ -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);
}
......
......@@ -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;
......
......@@ -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);
......
......@@ -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
......
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