OSDN Git Service

staging: rtl8192e: rename BaStartSeqCtrl to ba_start_seq_ctrl in ba_record struct
authorWilliam Durand <will+git@drnd.me>
Fri, 19 Feb 2021 23:11:27 +0000 (23:11 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Mar 2021 08:25:28 +0000 (09:25 +0100)
Fixes a checkpatch CHECK issue.

Signed-off-by: William Durand <will+git@drnd.me>
Link: https://lore.kernel.org/r/20210219231128.27119-7-will+git@drnd.me
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtl819x_BA.h
drivers/staging/rtl8192e/rtl819x_BAProc.c
drivers/staging/rtl8192e/rtllib_tx.c

index febe99f..1d2a11b 100644 (file)
@@ -54,7 +54,7 @@ struct ba_record {
        u8                              dialog_token;
        union ba_param_set ba_param_set;
        u16                             ba_timeout_value;
-       union sequence_control BaStartSeqCtrl;
+       union sequence_control ba_start_seq_ctrl;
 };
 
 #endif
index 68dcb9d..880b5f1 100644 (file)
@@ -57,11 +57,11 @@ static u8 RxTsDeleteBA(struct rtllib_device *ieee, struct rx_ts_record *pRxTs)
 
 void ResetBaEntry(struct ba_record *pBA)
 {
-       pBA->b_valid                    = false;
-       pBA->ba_param_set.short_data    = 0;
-       pBA->ba_timeout_value           = 0;
-       pBA->dialog_token               = 0;
-       pBA->BaStartSeqCtrl.short_data  = 0;
+       pBA->b_valid                      = false;
+       pBA->ba_param_set.short_data      = 0;
+       pBA->ba_timeout_value             = 0;
+       pBA->dialog_token                 = 0;
+       pBA->ba_start_seq_ctrl.short_data = 0;
 }
 static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst,
                                    struct ba_record *pBA,
@@ -114,7 +114,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst,
        tag += 2;
 
        if (type == ACT_ADDBAREQ) {
-               memcpy(tag, (u8 *)&(pBA->BaStartSeqCtrl), 2);
+               memcpy(tag, (u8 *)&(pBA->ba_start_seq_ctrl), 2);
                tag += 2;
        }
 
@@ -280,7 +280,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
        pBA->dialog_token = *pDialogToken;
        pBA->ba_param_set = *pBaParamSet;
        pBA->ba_timeout_value = *pBaTimeoutVal;
-       pBA->BaStartSeqCtrl = *pBaStartSeqCtrl;
+       pBA->ba_start_seq_ctrl = *pBaStartSeqCtrl;
 
        if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev) ||
           (ieee->pHTInfo->IOTAction & HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT))
@@ -387,7 +387,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
 
                pAdmittedBA->dialog_token = *pDialogToken;
                pAdmittedBA->ba_timeout_value = *pBaTimeoutVal;
-               pAdmittedBA->BaStartSeqCtrl = pPendingBA->BaStartSeqCtrl;
+               pAdmittedBA->ba_start_seq_ctrl = pPendingBA->ba_start_seq_ctrl;
                pAdmittedBA->ba_param_set = *pBaParamSet;
                DeActivateBAEntry(ieee, pAdmittedBA);
                ActivateBAEntry(ieee, pAdmittedBA, *pBaTimeoutVal);
@@ -488,7 +488,7 @@ void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS,
        pBA->ba_param_set.field.tid = pTS->TsCommonInfo.TSpec.f.TSInfo.field.ucTSID;
        pBA->ba_param_set.field.buffer_size = 32;
        pBA->ba_timeout_value = 0;
-       pBA->BaStartSeqCtrl.field.seq_num = (pTS->TxCurSeq + 3) % 4096;
+       pBA->ba_start_seq_ctrl.field.seq_num = (pTS->TxCurSeq + 3) % 4096;
 
        ActivateBAEntry(ieee, pBA, BA_SETUP_TIMEOUT);
 
index 3ac5fd8..89ec72b 100644 (file)
@@ -308,7 +308,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
                        }
                        goto FORCED_AGG_SETTING;
                } else if (!pTxTs->bUsingBa) {
-                       if (SN_LESS(pTxTs->TxAdmittedBARecord.BaStartSeqCtrl.field.seq_num,
+                       if (SN_LESS(pTxTs->TxAdmittedBARecord.ba_start_seq_ctrl.field.seq_num,
                           (pTxTs->TxCurSeq+1)%4096))
                                pTxTs->bUsingBa = true;
                        else