Rename variable TxAdmittedBARecord to tx_admitted_ba_record to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies <tdavies@xxxxxxxxxxxxxxx> --- 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