Staging: rtl8192e: Rename variable bCurrentHTSupport

Rename variable bCurrentHTSupport to current_ht_support to fix checkpatch
warning Avoid CamelCase.

Signed-off-by: Tree Davies <tdavies@darkphysics.net>
Link: https://lore.kernel.org/r/20231003031849.176743-3-tdavies@darkphysics.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 4e9a0138ce551804bd458435f9b9504921081a85..d01cfca39ef5074671b881e65fb65cbbd3c37a86 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -294,7 +294,7 @@ static void _rtl92e_update_beacon(void *data)
        struct rtllib_device *ieee = priv->rtllib;
        struct rtllib_network *net = &ieee->current_network;
 
-       if (ieee->ht_info->bCurrentHTSupport)
+       if (ieee->ht_info->current_ht_support)
                HT_update_self_and_peer_setting(ieee, net);
        ieee->ht_info->current_rt2rt_long_slot_time = net->bssht.bd_rt2rt_long_slot_time;
        ieee->ht_info->RT2RT_HT_Mode = net->bssht.rt2rt_ht_mode;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index ec09066f2f32ada62871aea69442312d9c7bd5fc..e7be89833b597ca5414f31e201235ba25c66c701 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -851,7 +851,7 @@ static int _rtl92e_wx_set_encode_ext(struct net_device *dev,
                        rtl92e_set_swcam(dev, idx, idx, alg, broadcast_addr, key);
                } else {
                        if ((ieee->pairwise_key_type == KEY_TYPE_CCMP) &&
-                            ieee->ht_info->bCurrentHTSupport)
+                            ieee->ht_info->current_ht_support)
                                rtl92e_writeb(dev, 0x173, 1);
                        rtl92e_set_key(dev, 4, idx, alg,
                                       (u8 *)ieee->ap_mac_addr, 0, key);

diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c
index 820b5ee2ded1c73b3b17a13549006f44aa857ace..15e4b83af23480636085aea34e68203c7c5d51e4 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c
@@ -244,13 +244,13 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
        pBaStartSeqCtrl = (union sequence_control *)(req + 7);
 
        if (!ieee->current_network.qos_data.active ||
-           !ieee->ht_info->bCurrentHTSupport ||
+           !ieee->ht_info->current_ht_support ||
            (ieee->ht_info->iot_action & HT_IOT_ACT_REJECT_ADDBA_REQ)) {
                rc = ADDBA_STATUS_REFUSED;
                netdev_warn(ieee->dev,
                            "Failed to reply on ADDBA_REQ as some capability is not ready(%d, %d)\n",
                            ieee->current_network.qos_data.active,
-                           ieee->ht_info->bCurrentHTSupport);
+                           ieee->ht_info->current_ht_support);
                goto OnADDBAReq_Fail;
        }
        if (!rtllib_get_ts(ieee, (struct ts_common_info **)&ts, dst,
@@ -326,12 +326,12 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
        pBaTimeoutVal = (u16 *)(tag + 7);
 
        if (!ieee->current_network.qos_data.active ||
-           !ieee->ht_info->bCurrentHTSupport ||
+           !ieee->ht_info->current_ht_support ||
            !ieee->ht_info->bCurrentAMPDUEnable) {
                netdev_warn(ieee->dev,
                            "reject to ADDBA_RSP as some capability is not ready(%d, %d, %d)\n",
                            ieee->current_network.qos_data.active,
-                           ieee->ht_info->bCurrentHTSupport,
+                           ieee->ht_info->current_ht_support,
                            ieee->ht_info->bCurrentAMPDUEnable);
                ReasonCode = DELBA_REASON_UNKNOWN_BA;
                goto OnADDBARsp_Reject;
@@ -413,11 +413,11 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb)
        }
 
        if (!ieee->current_network.qos_data.active ||
-           !ieee->ht_info->bCurrentHTSupport) {
+           !ieee->ht_info->current_ht_support) {
                netdev_warn(ieee->dev,
                            "received DELBA while QOS or HT is not supported(%d, %d)\n",
                            ieee->current_network. qos_data.active,
-                           ieee->ht_info->bCurrentHTSupport);
+                           ieee->ht_info->current_ht_support);
                return -1;
        }
 

diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 2bbd0104856134e1ea157d627ce51d881ac7105b..f8eb4d553fe02f1a4261f7e589f20e144d2ab9df 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -93,7 +93,7 @@ enum ht_aggre_mode {
 
 struct rt_hi_throughput {
        u8 enable_ht;
-       u8 bCurrentHTSupport;
+       u8 current_ht_support;
        u8 bRegBW40MHz;
        u8 bCurBW40MHz;
        u8 bRegShortGI40MHz;

diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index a7e356e90d0ea09f32396e27010cf967151f96c4..bb80d3ba182dfe0429de39b902d6c51c3f20ca8b 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -489,7 +489,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
        static const u8 EWC11NHTCap[] = { 0x00, 0x90, 0x4c, 0x33 };
        static const u8 EWC11NHTInfo[] = { 0x00, 0x90, 0x4c, 0x34 };
 
-       if (!ht_info->bCurrentHTSupport) {
+       if (!ht_info->current_ht_support) {
                netdev_warn(ieee->dev, "%s(): HT_DISABLE\n", __func__);
                return;
        }
@@ -594,7 +594,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee)
 {
        struct rt_hi_throughput *ht_info = ieee->ht_info;
 
-       ht_info->bCurrentHTSupport = false;
+       ht_info->current_ht_support = false;
 
        ht_info->bCurBW40MHz = false;
        ht_info->cur_tx_bw40mhz = false;
@@ -665,7 +665,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
         * function rtllib_softmac_new_net. WB 2008.09.10
         */
        if (pNetwork->bssht.bd_support_ht) {
-               ht_info->bCurrentHTSupport = true;
+               ht_info->current_ht_support = true;
                ht_info->ePeerHTSpecVer = pNetwork->bssht.bd_ht_spec_ver;
 
                if (pNetwork->bssht.bd_ht_cap_len > 0 &&
@@ -719,7 +719,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
                if (bIOTAction)
                        ht_info->iot_action |= HT_IOT_ACT_CDD_FSYNC;
        } else {
-               ht_info->bCurrentHTSupport = false;
+               ht_info->current_ht_support = false;
                ht_info->current_rt2rt_aggregation = false;
                ht_info->current_rt2rt_long_slot_time = false;
                ht_info->RT2RT_HT_Mode = (enum rt_ht_capability)0;
@@ -736,7 +736,7 @@ void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
        struct ht_info_ele *pPeerHTInfo =
                 (struct ht_info_ele *)pNetwork->bssht.bd_ht_info_buf;
 
-       if (ht_info->bCurrentHTSupport) {
+       if (ht_info->current_ht_support) {
                if (pNetwork->bssht.bd_ht_info_len != 0)
                        ht_info->current_op_mode = pPeerHTInfo->OptMode;
        }
@@ -745,7 +745,7 @@ EXPORT_SYMBOL(HT_update_self_and_peer_setting);
 
 u8 HTCCheck(struct rtllib_device *ieee, u8 *pFrame)
 {
-       if (ieee->ht_info->bCurrentHTSupport) {
+       if (ieee->ht_info->current_ht_support) {
                if ((IsQoSDataFrame(pFrame) && Frame_Order(pFrame)) == 1) {
                        netdev_dbg(ieee->dev, "HT CONTROL FILED EXIST!!\n");
                        return true;

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 79a62bd9a2973ed26cfa4b088e6beba87d35b7a2..de1808b372d93ddb84ef63d7fc577ee05e039700 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -769,7 +769,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee,
        crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
        encrypt = crypt && crypt->ops &&
                ((strcmp(crypt->ops->name, "R-WEP") == 0 || wpa_ie_len));
-       if (ieee->ht_info->bCurrentHTSupport) {
+       if (ieee->ht_info->current_ht_support) {
                tmp_ht_cap_buf = (u8 *)&(ieee->ht_info->SelfHTCap);
                tmp_ht_cap_len = sizeof(ieee->ht_info->SelfHTCap);
                tmp_ht_info_buf = (u8 *)&(ieee->ht_info->SelfHTInfo);
@@ -976,7 +976,7 @@ rtllib_association_req(struct rtllib_network *beacon,
                ieee->mode = WIRELESS_MODE_G;
        }
 
-       if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht) {
+       if (ieee->ht_info->current_ht_support && ieee->ht_info->enable_ht) {
                ht_cap_buf = (u8 *)&(ieee->ht_info->SelfHTCap);
                ht_cap_len = sizeof(ieee->ht_info->SelfHTCap);
                HTConstructCapabilityElement(ieee, ht_cap_buf, &ht_cap_len,
@@ -1114,7 +1114,7 @@ rtllib_association_req(struct rtllib_network *beacon,
                memcpy(tag, osCcxVerNum.Octet, osCcxVerNum.Length);
                tag += osCcxVerNum.Length;
        }
-       if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht) {
+       if (ieee->ht_info->current_ht_support && ieee->ht_info->enable_ht) {
                if (ieee->ht_info->ePeerHTSpecVer != HT_SPEC_VER_EWC) {
                        tag = skb_put(skb, ht_cap_len);
                        *tag++ = MFIE_TYPE_HT_CAP;
@@ -1148,7 +1148,7 @@ rtllib_association_req(struct rtllib_network *beacon,
                rtllib_TURBO_Info(ieee, &tag);
        }
 
-       if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht) {
+       if (ieee->ht_info->current_ht_support && ieee->ht_info->enable_ht) {
                if (ieee->ht_info->ePeerHTSpecVer == HT_SPEC_VER_EWC) {
                        tag = skb_put(skb, ht_cap_len);
                        *tag++ = MFIE_TYPE_GENERIC;
@@ -1311,13 +1311,13 @@ static void rtllib_associate_complete_wq(void *data)
                ieee->set_wireless_mode(ieee->dev, WIRELESS_MODE_B);
                netdev_info(ieee->dev, "Using B rates:%d\n", ieee->rate);
        }
-       if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht) {
+       if (ieee->ht_info->current_ht_support && ieee->ht_info->enable_ht) {
                netdev_info(ieee->dev, "Successfully associated, ht enabled\n");
                HTOnAssocRsp(ieee);
        } else {
                netdev_info(ieee->dev,
                            "Successfully associated, ht not enabled(%d, %d)\n",
-                           ieee->ht_info->bCurrentHTSupport,
+                           ieee->ht_info->current_ht_support,
                            ieee->ht_info->enable_ht);
                memset(ieee->dot11ht_oper_rate_set, 0, 16);
        }
@@ -1471,8 +1471,7 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee,
                                        HTResetSelfAndSavePeerSetting(ieee,
                                                 &(ieee->current_network));
                                else
-                                       ieee->ht_info->bCurrentHTSupport =
-                                                                false;
+                                       ieee->ht_info->current_ht_support = false;
 
                                ieee->link_state = RTLLIB_ASSOCIATING;
                                schedule_delayed_work(

diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index e9da566646c5622857216a4a564f1be5ba7aad8c..bd2b8bba86eb8ec9705c8ebd9afc1c72c1062b2c 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -317,7 +317,7 @@ void rtllib_wx_sync_scan_wq(void *data)
 
        ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP);
 
-       if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht &&
+       if (ieee->ht_info->current_ht_support && ieee->ht_info->enable_ht &&
            ieee->ht_info->bCurBW40MHz) {
                b40M = 1;
                chan_offset = ieee->ht_info->CurSTAExtChnlOffset;

diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index bad01599033babcb526df3d50fea0332188df258..53ad5e3fb1747c0762c1e0cae4c437b7ad8b71e2 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -273,7 +273,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
        if (rtllib_act_scanning(ieee, false))
                return;
 
-       if (!ht_info->bCurrentHTSupport || !ht_info->enable_ht)
+       if (!ht_info->current_ht_support || !ht_info->enable_ht)
                return;
        if (!IsQoSDataFrame(skb->data))
                return;
@@ -354,7 +354,7 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee,
 
        tcb_desc->bUseShortGI           = false;
 
-       if (!ht_info->bCurrentHTSupport || !ht_info->enable_ht)
+       if (!ht_info->current_ht_support || !ht_info->enable_ht)
                return;
 
        if (ht_info->forced_short_gi) {
@@ -375,7 +375,7 @@ static void rtllib_query_BandwidthMode(struct rtllib_device *ieee,
 
        tcb_desc->bPacketBW = false;
 
-       if (!ht_info->bCurrentHTSupport || !ht_info->enable_ht)
+       if (!ht_info->current_ht_support || !ht_info->enable_ht)
                return;
 
        if (tcb_desc->bMulticast || tcb_desc->bBroadcast)
@@ -438,7 +438,7 @@ static void rtllib_query_protectionmode(struct rtllib_device *ieee,
                        tcb_desc->rts_rate = MGN_24M;
                        break;
                }
-               if (ht_info->bCurrentHTSupport  && ht_info->enable_ht) {
+               if (ht_info->current_ht_support && ht_info->enable_ht) {
                        u8 HTOpMode = ht_info->current_op_mode;
 
                        if ((ht_info->bCurBW40MHz && (HTOpMode == 2 ||