Rename variable TxAdmittedBARecord to tx_admitted_ba_record in order 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 bb9705222bc7..a58df1d94585 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 *pb static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *ptx_ts) { - struct ba_record *padmitted_ba = &ptx_ts->TxAdmittedBARecord; + struct ba_record *padmitted_ba = &ptx_ts->tx_admitted_ba_record; struct ba_record *pPendingBa = &ptx_ts->TxPendingBARecord; u8 bSendDELBA = false; @@ -346,7 +346,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) pTS->bAddBaReqInProgress = false; pPendingBA = &pTS->TxPendingBARecord; - pAdmittedBA = &pTS->TxAdmittedBARecord; + pAdmittedBA = &pTS->tx_admitted_ba_record; if (pAdmittedBA->b_valid) { netdev_dbg(ieee->dev, "%s(): ADDBA response already admitted\n", @@ -494,8 +494,8 @@ void ts_init_del_ba(struct rtllib_device *ieee, if (tx_ts_delete_ba(ieee, ptx_ts)) rtllib_send_DELBA(ieee, pTsCommonInfo->Addr, - (ptx_ts->TxAdmittedBARecord.b_valid) ? - (&ptx_ts->TxAdmittedBARecord) : + (ptx_ts->tx_admitted_ba_record.b_valid) ? + (&ptx_ts->tx_admitted_ba_record) : (&ptx_ts->TxPendingBARecord), TxRxSelect, DELBA_REASON_END_BA); } else if (TxRxSelect == RX_DIR) { @@ -521,12 +521,12 @@ void ba_setup_time_out(struct timer_list *t) void tx_ba_inact_timeout(struct timer_list *t) { struct tx_ts_record *ptx_ts = from_timer(ptx_ts, t, - TxAdmittedBARecord.timer); + tx_admitted_ba_record.timer); struct rtllib_device *ieee = container_of(ptx_ts, struct rtllib_device, TxTsRecord[ptx_ts->num]); tx_ts_delete_ba(ieee, ptx_ts); rtllib_send_DELBA(ieee, ptx_ts->TsCommonInfo.Addr, - &ptx_ts->TxAdmittedBARecord, TX_DIR, + &ptx_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 37760d0bc35d..653ca479a00c 100644 --- a/drivers/staging/rtl8192e/rtl819x_TS.h +++ b/drivers/staging/rtl8192e/rtl819x_TS.h @@ -32,7 +32,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 bAddBaReqInProgress; u8 bAddBaReqDelayed; u8 bUsingBa; diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index 35c4083542fc..696cc0905546 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -117,7 +117,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS) pTS->bAddBaReqDelayed = false; pTS->bUsingBa = false; pTS->bDisable_AddBa = false; - ResetBaEntry(&pTS->TxAdmittedBARecord); + ResetBaEntry(&pTS->tx_admitted_ba_record); ResetBaEntry(&pTS->TxPendingBARecord); } @@ -152,7 +152,7 @@ void TSInitialize(struct rtllib_device *ieee) timer_setup(&pTxTS->TxPendingBARecord.timer, ba_setup_time_out, 0); - timer_setup(&pTxTS->TxAdmittedBARecord.timer, + timer_setup(&pTxTS->tx_admitted_ba_record.timer, tx_ba_inact_timeout, 0); ResetTxTsEntry(pTxTS); diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c index e43a9b26e01a..dad176b1a211 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 (!ptx_ts->TxAdmittedBARecord.b_valid) { + if (!ptx_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 (!ptx_ts->bUsingBa) { - if (SN_LESS(ptx_ts->TxAdmittedBARecord.ba_start_seq_ctrl.field.seq_num, + if (SN_LESS(ptx_ts->tx_admitted_ba_record.ba_start_seq_ctrl.field.seq_num, (ptx_ts->TxCurSeq + 1) % 4096)) ptx_ts->bUsingBa = true; else -- 2.41.0