OSDN Git Service

staging: rtl8192e: rename bdHTCapLen to bd_ht_cap_len in bss_ht struct
authorWilliam Durand <will+git@drnd.me>
Sat, 20 Feb 2021 17:29:00 +0000 (17:29 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Mar 2021 08:25:29 +0000 (09:25 +0100)
Rename bdHTCapLen to bd_ht_cap_len to silence a checkpatch warning about
CamelCase.

Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: William Durand <will+git@drnd.me>
Link: https://lore.kernel.org/r/20210220172909.15812-5-will+git@drnd.me
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtl819x_HT.h
drivers/staging/rtl8192e/rtl819x_HTProc.c
drivers/staging/rtl8192e/rtllib_rx.c
drivers/staging/rtl8192e/rtllib_softmac.c

index 3b7b480..cd5dc4a 100644 (file)
@@ -182,7 +182,7 @@ struct bss_ht {
        u8                              bd_support_ht;
 
        u8                                      bd_ht_cap_buf[32];
-       u16                                     bdHTCapLen;
+       u16                                     bd_ht_cap_len;
        u8                                      bdHTInfoBuf[32];
        u16                                     bdHTInfoLen;
 
index 14c00c6..786df3f 100644 (file)
@@ -691,7 +691,7 @@ void HTInitializeBssDesc(struct bss_ht *pBssHT)
 
        pBssHT->bd_support_ht = false;
        memset(pBssHT->bd_ht_cap_buf, 0, sizeof(pBssHT->bd_ht_cap_buf));
-       pBssHT->bdHTCapLen = 0;
+       pBssHT->bd_ht_cap_len = 0;
        memset(pBssHT->bdHTInfoBuf, 0, sizeof(pBssHT->bdHTInfoBuf));
        pBssHT->bdHTInfoLen = 0;
 
@@ -716,11 +716,11 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
                pHTInfo->bCurrentHTSupport = true;
                pHTInfo->ePeerHTSpecVer = pNetwork->bssht.bdHTSpecVer;
 
-               if (pNetwork->bssht.bdHTCapLen > 0 &&
-                   pNetwork->bssht.bdHTCapLen <= sizeof(pHTInfo->PeerHTCapBuf))
+               if (pNetwork->bssht.bd_ht_cap_len > 0 &&
+                   pNetwork->bssht.bd_ht_cap_len <= sizeof(pHTInfo->PeerHTCapBuf))
                        memcpy(pHTInfo->PeerHTCapBuf,
                               pNetwork->bssht.bd_ht_cap_buf,
-                              pNetwork->bssht.bdHTCapLen);
+                              pNetwork->bssht.bd_ht_cap_len);
 
                if (pNetwork->bssht.bdHTInfoLen > 0 &&
                    pNetwork->bssht.bdHTInfoLen <=
index 2abda3d..697fd7f 100644 (file)
@@ -1851,11 +1851,11 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
                                               MAX_IE_LEN);
                        if (*tmp_htcap_len != 0) {
                                network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC;
-                               network->bssht.bdHTCapLen = min_t(u16, *tmp_htcap_len,
+                               network->bssht.bd_ht_cap_len = min_t(u16, *tmp_htcap_len,
                                                                  sizeof(network->bssht.bd_ht_cap_buf));
                                memcpy(network->bssht.bd_ht_cap_buf,
                                       info_element->data,
-                                      network->bssht.bdHTCapLen);
+                                      network->bssht.bd_ht_cap_len);
                        }
                }
                if (*tmp_htcap_len != 0) {
@@ -2022,9 +2022,9 @@ static void rtllib_parse_mfie_ht_cap(struct rtllib_info_element *info_element,
        *tmp_htcap_len = min_t(u8, info_element->len, MAX_IE_LEN);
        if (*tmp_htcap_len != 0) {
                ht->bdHTSpecVer = HT_SPEC_VER_EWC;
-               ht->bdHTCapLen = min_t(u16, *tmp_htcap_len,
+               ht->bd_ht_cap_len = min_t(u16, *tmp_htcap_len,
                                       sizeof(ht->bd_ht_cap_buf));
-               memcpy(ht->bd_ht_cap_buf, info_element->data, ht->bdHTCapLen);
+               memcpy(ht->bd_ht_cap_buf, info_element->data, ht->bd_ht_cap_len);
 
                ht->bd_support_ht = true;
                ht->bdHT1R = ((((struct ht_capab_ele *)
@@ -2459,9 +2459,9 @@ static inline void update_network(struct rtllib_device *ieee,
 
        dst->bssht.bd_support_ht = src->bssht.bd_support_ht;
        dst->bssht.bdRT2RTAggregation = src->bssht.bdRT2RTAggregation;
-       dst->bssht.bdHTCapLen = src->bssht.bdHTCapLen;
+       dst->bssht.bd_ht_cap_len = src->bssht.bd_ht_cap_len;
        memcpy(dst->bssht.bd_ht_cap_buf, src->bssht.bd_ht_cap_buf,
-              src->bssht.bdHTCapLen);
+              src->bssht.bd_ht_cap_len);
        dst->bssht.bdHTInfoLen = src->bssht.bdHTInfoLen;
        memcpy(dst->bssht.bdHTInfoBuf, src->bssht.bdHTInfoBuf,
               src->bssht.bdHTInfoLen);
index 6f8f882..82863f7 100644 (file)
@@ -2239,7 +2239,7 @@ rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb,
                                }
                                memcpy(ieee->pHTInfo->PeerHTCapBuf,
                                       network->bssht.bd_ht_cap_buf,
-                                      network->bssht.bdHTCapLen);
+                                      network->bssht.bd_ht_cap_len);
                                memcpy(ieee->pHTInfo->PeerHTInfoBuf,
                                       network->bssht.bdHTInfoBuf,
                                       network->bssht.bdHTInfoLen);