staging:rtl8192u: Rename ba_param_set members - Style

Rename the member variables of union ba_param_set to clear the
checkpatch issue with CamelCase naming:

AMSDU_Support  to  amsdu_support
BAPolicy       to  ba_policy
TID            to  tid
BufferSize     to  buffer_size

These are coding style changes which should have no impact on
runtime code execution.

Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
index d3730fc6c8fe8759a1176ad16f979f31d52e8ef2..8beae1af63a13e50d1cc074d402959d988299e74 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
@@ -33,10 +33,10 @@ union sequence_control {
 union ba_param_set {
        u16 short_data;
        struct {
-               u16 AMSDU_Support:1;
-               u16 BAPolicy:1;
-               u16 TID:4;
-               u16 BufferSize:10;
+               u16 amsdu_support:1;
+               u16 ba_policy:1;
+               u16 tid:4;
+               u16 buffer_size:10;
        } field;
 };
 

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
index 1a9271548b9428c80280d0135e2ceb83a02b237f..42f458b4ece02dd6ab33b5b0323b1b886f9c7a0e 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
@@ -202,7 +202,7 @@ static struct sk_buff *ieee80211_DELBA(
        memset(&DelbaParamSet, 0, 2);
 
        DelbaParamSet.field.Initiator   = (TxRxSelect == TX_DIR) ? 1 : 0;
-       DelbaParamSet.field.TID = pBA->BaParamSet.field.TID;
+       DelbaParamSet.field.TID = pBA->BaParamSet.field.tid;
 
        skb = dev_alloc_skb(len + sizeof(struct rtl_80211_hdr_3addr)); //need to add something others? FIXME
        if (!skb) {
@@ -362,7 +362,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
                        ieee,
                        (struct ts_common_info **)(&pTS),
                        dst,
-                       (u8)(pBaParamSet->field.TID),
+                       (u8)(pBaParamSet->field.tid),
                        RX_DIR,
                        true)) {
                rc = ADDBA_STATUS_REFUSED;
@@ -371,10 +371,10 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
        }
        pBA = &pTS->rx_admitted_ba_record;
        // To Determine the ADDBA Req content
-       // We can do much more check here, including BufferSize, AMSDU_Support, Policy, StartSeqCtrl...
+       // We can do much more check here, including buffer_size, AMSDU_Support, Policy, StartSeqCtrl...
        // I want to check StartSeqCtrl to make sure when we start aggregation!!!
        //
-       if (pBaParamSet->field.BAPolicy == BA_POLICY_DELAYED) {
+       if (pBaParamSet->field.ba_policy == BA_POLICY_DELAYED) {
                rc = ADDBA_STATUS_INVALID_PARAM;
                IEEE80211_DEBUG(IEEE80211_DL_ERR, "BA Policy is not correct in %s()\n", __func__);
                goto OnADDBAReq_Fail;
@@ -388,9 +388,9 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
        pBA->BaStartSeqCtrl = *pBaStartSeqCtrl;
        //for half N mode we only aggregate 1 frame
        if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))
-       pBA->BaParamSet.field.BufferSize = 1;
+       pBA->BaParamSet.field.buffer_size = 1;
        else
-       pBA->BaParamSet.field.BufferSize = 32;
+       pBA->BaParamSet.field.buffer_size = 32;
        ActivateBAEntry(ieee, pBA, pBA->BaTimeoutValue);
        ieee80211_send_ADDBARsp(ieee, dst, pBA, ADDBA_STATUS_SUCCESS);
 
@@ -403,7 +403,7 @@ OnADDBAReq_Fail:
                BA.BaParamSet = *pBaParamSet;
                BA.BaTimeoutValue = *pBaTimeoutVal;
                BA.DialogToken = *pDialogToken;
-               BA.BaParamSet.field.BAPolicy = BA_POLICY_IMMEDIATE;
+               BA.BaParamSet.field.ba_policy = BA_POLICY_IMMEDIATE;
                ieee80211_send_ADDBARsp(ieee, dst, &BA, rc);
                return 0; //we send RSP out.
        }
@@ -461,7 +461,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
                        ieee,
                        (struct ts_common_info **)(&pTS),
                        dst,
-                       (u8)(pBaParamSet->field.TID),
+                       (u8)(pBaParamSet->field.tid),
                        TX_DIR,
                        false)) {
                IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS in %s()\n", __func__);
@@ -498,7 +498,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
                // We can compare the value of BA parameter set that Peer returned and Self sent.
                // If it is OK, then admitted. Or we can send DELBA to cancel BA mechanism.
                //
-               if (pBaParamSet->field.BAPolicy == BA_POLICY_DELAYED) {
+               if (pBaParamSet->field.ba_policy == BA_POLICY_DELAYED) {
                        // Since this is a kind of ADDBA failed, we delay next ADDBA process.
                        pTS->add_ba_req_delayed = true;
                        DeActivateBAEntry(ieee, pAdmittedBA);
@@ -624,11 +624,11 @@ TsInitAddBA(
        DeActivateBAEntry(ieee, pBA);
 
        pBA->DialogToken++;                                             // DialogToken: Only keep the latest dialog token
-       pBA->BaParamSet.field.AMSDU_Support = 0;        // Do not support A-MSDU with A-MPDU now!!
-       pBA->BaParamSet.field.BAPolicy = Policy;        // Policy: Delayed or Immediate
-       pBA->BaParamSet.field.TID = pTS->ts_common_info.t_spec.ts_info.uc_tsid; // TID
-       // BufferSize: This need to be set according to A-MPDU vector
-       pBA->BaParamSet.field.BufferSize = 32;          // BufferSize: This need to be set according to A-MPDU vector
+       pBA->BaParamSet.field.amsdu_support = 0;        // Do not support A-MSDU with A-MPDU now!!
+       pBA->BaParamSet.field.ba_policy = Policy;       // Policy: Delayed or Immediate
+       pBA->BaParamSet.field.tid = pTS->ts_common_info.t_spec.ts_info.uc_tsid; // TID
+       // buffer_size: This need to be set according to A-MPDU vector
+       pBA->BaParamSet.field.buffer_size = 32;         // buffer_size: This need to be set according to A-MPDU vector
        pBA->BaTimeoutValue = 0;                                        // Timeout value: Set 0 to disable Timer
        pBA->BaStartSeqCtrl.field.seq_num = (pTS->tx_cur_seq + 3) % 4096;       // Block Ack will start after 3 packets later.