staging: rtl8192e: rename bdHTInfoBuf to bd_ht_info_buf in bss_ht struct

Rename bdHTInfoBuf to bd_ht_info_buf 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-6-will+git@drnd.me
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index cd5dc4a3abe32a02a2fafb21e49351d8412f4f09..29650e55361a991bafc77c55cdfa98ee38a360f1 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -183,7 +183,7 @@ struct bss_ht {
 
        u8                                      bd_ht_cap_buf[32];
        u16                                     bd_ht_cap_len;
-       u8                                      bdHTInfoBuf[32];
+       u8                                      bd_ht_info_buf[32];
        u16                                     bdHTInfoLen;
 
        enum ht_spec_ver bdHTSpecVer;

diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 786df3fbedc2889f85d4848310dd30da8c7aa093..93fd73a7203b705a6e0d088ab7de18aabeba6c65 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -692,7 +692,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->bd_ht_cap_len = 0;
-       memset(pBssHT->bdHTInfoBuf, 0, sizeof(pBssHT->bdHTInfoBuf));
+       memset(pBssHT->bd_ht_info_buf, 0, sizeof(pBssHT->bd_ht_info_buf));
        pBssHT->bdHTInfoLen = 0;
 
        pBssHT->bdHTSpecVer = HT_SPEC_VER_IEEE;
@@ -726,7 +726,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
                    pNetwork->bssht.bdHTInfoLen <=
                    sizeof(pHTInfo->PeerHTInfoBuf))
                        memcpy(pHTInfo->PeerHTInfoBuf,
-                              pNetwork->bssht.bdHTInfoBuf,
+                              pNetwork->bssht.bd_ht_info_buf,
                               pNetwork->bssht.bdHTInfoLen);
 
                if (pHTInfo->bRegRT2RTAggregation) {
@@ -783,7 +783,7 @@ void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
 {
        struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
        struct ht_info_ele *pPeerHTInfo =
-                (struct ht_info_ele *)pNetwork->bssht.bdHTInfoBuf;
+                (struct ht_info_ele *)pNetwork->bssht.bd_ht_info_buf;
 
        if (pHTInfo->bCurrentHTSupport) {
                if (pNetwork->bssht.bdHTInfoLen != 0)

diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index 697fd7fcb48b57bc65c05028c5e34611db0a1c2a..5facd55839f5fd12e348e3199aa223a4b0e1ff69 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -1878,8 +1878,9 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
                                                MAX_IE_LEN);
                        if (*tmp_htinfo_len != 0) {
                                network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC;
-                               network->bssht.bdHTInfoLen = min_t(u16, *tmp_htinfo_len, sizeof(network->bssht.bdHTInfoBuf));
-                               memcpy(network->bssht.bdHTInfoBuf,
+                               network->bssht.bdHTInfoLen = min_t(u16, *tmp_htinfo_len,
+                                                                  sizeof(network->bssht.bd_ht_info_buf));
+                               memcpy(network->bssht.bd_ht_info_buf,
                                       info_element->data,
                                       network->bssht.bdHTInfoLen);
                        }
@@ -2235,10 +2236,10 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
                        if (tmp_htinfo_len) {
                                network->bssht.bdHTSpecVer = HT_SPEC_VER_IEEE;
                                network->bssht.bdHTInfoLen = tmp_htinfo_len >
-                                       sizeof(network->bssht.bdHTInfoBuf) ?
-                                       sizeof(network->bssht.bdHTInfoBuf) :
+                                       sizeof(network->bssht.bd_ht_info_buf) ?
+                                       sizeof(network->bssht.bd_ht_info_buf) :
                                        tmp_htinfo_len;
-                               memcpy(network->bssht.bdHTInfoBuf,
+                               memcpy(network->bssht.bd_ht_info_buf,
                                       info_element->data,
                                       network->bssht.bdHTInfoLen);
                        }
@@ -2463,7 +2464,7 @@ static inline void update_network(struct rtllib_device *ieee,
        memcpy(dst->bssht.bd_ht_cap_buf, src->bssht.bd_ht_cap_buf,
               src->bssht.bd_ht_cap_len);
        dst->bssht.bdHTInfoLen = src->bssht.bdHTInfoLen;
-       memcpy(dst->bssht.bdHTInfoBuf, src->bssht.bdHTInfoBuf,
+       memcpy(dst->bssht.bd_ht_info_buf, src->bssht.bd_ht_info_buf,
               src->bssht.bdHTInfoLen);
        dst->bssht.bdHTSpecVer = src->bssht.bdHTSpecVer;
        dst->bssht.bdRT2RTLongSlotTime = src->bssht.bdRT2RTLongSlotTime;

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 82863f73790619cebc0c7e933b449c797e690f76..2d6d629685f4d7f15a23179abe623fd03d25edf6 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -2241,7 +2241,7 @@ rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb,
                                       network->bssht.bd_ht_cap_buf,
                                       network->bssht.bd_ht_cap_len);
                                memcpy(ieee->pHTInfo->PeerHTInfoBuf,
-                                      network->bssht.bdHTInfoBuf,
+                                      network->bssht.bd_ht_info_buf,
                                       network->bssht.bdHTInfoLen);
                                if (ieee->handle_assoc_response != NULL)
                                        ieee->handle_assoc_response(ieee->dev,