Commit 2fbcd6de authored by William Durand's avatar William Durand Committed by Greg Kroah-Hartman

staging: rtl8192e: rename bdHTSpecVer to bd_ht_spec_ver in bss_ht struct

Rename bdHTSpecVer to bd_ht_spec_ver to silence a checkpatch warning
about CamelCase.
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarWilliam Durand <will+git@drnd.me>
Link: https://lore.kernel.org/r/20210220172909.15812-8-will+git@drnd.meSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 060d3f6c
...@@ -186,7 +186,7 @@ struct bss_ht { ...@@ -186,7 +186,7 @@ struct bss_ht {
u8 bd_ht_info_buf[32]; u8 bd_ht_info_buf[32];
u16 bd_ht_info_len; u16 bd_ht_info_len;
enum ht_spec_ver bdHTSpecVer; enum ht_spec_ver bd_ht_spec_ver;
enum ht_channel_width bdBandWidth; enum ht_channel_width bdBandWidth;
u8 bdRT2RTAggregation; u8 bdRT2RTAggregation;
......
...@@ -695,7 +695,7 @@ void HTInitializeBssDesc(struct bss_ht *pBssHT) ...@@ -695,7 +695,7 @@ void HTInitializeBssDesc(struct bss_ht *pBssHT)
memset(pBssHT->bd_ht_info_buf, 0, sizeof(pBssHT->bd_ht_info_buf)); memset(pBssHT->bd_ht_info_buf, 0, sizeof(pBssHT->bd_ht_info_buf));
pBssHT->bd_ht_info_len = 0; pBssHT->bd_ht_info_len = 0;
pBssHT->bdHTSpecVer = HT_SPEC_VER_IEEE; pBssHT->bd_ht_spec_ver = HT_SPEC_VER_IEEE;
pBssHT->bdRT2RTAggregation = false; pBssHT->bdRT2RTAggregation = false;
pBssHT->bdRT2RTLongSlotTime = false; pBssHT->bdRT2RTLongSlotTime = false;
...@@ -714,7 +714,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, ...@@ -714,7 +714,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
*/ */
if (pNetwork->bssht.bd_support_ht) { if (pNetwork->bssht.bd_support_ht) {
pHTInfo->bCurrentHTSupport = true; pHTInfo->bCurrentHTSupport = true;
pHTInfo->ePeerHTSpecVer = pNetwork->bssht.bdHTSpecVer; pHTInfo->ePeerHTSpecVer = pNetwork->bssht.bd_ht_spec_ver;
if (pNetwork->bssht.bd_ht_cap_len > 0 && if (pNetwork->bssht.bd_ht_cap_len > 0 &&
pNetwork->bssht.bd_ht_cap_len <= sizeof(pHTInfo->PeerHTCapBuf)) pNetwork->bssht.bd_ht_cap_len <= sizeof(pHTInfo->PeerHTCapBuf))
......
...@@ -1850,7 +1850,7 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee, ...@@ -1850,7 +1850,7 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
*tmp_htcap_len = min_t(u8, info_element->len, *tmp_htcap_len = min_t(u8, info_element->len,
MAX_IE_LEN); MAX_IE_LEN);
if (*tmp_htcap_len != 0) { if (*tmp_htcap_len != 0) {
network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC; network->bssht.bd_ht_spec_ver = HT_SPEC_VER_EWC;
network->bssht.bd_ht_cap_len = 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)); sizeof(network->bssht.bd_ht_cap_buf));
memcpy(network->bssht.bd_ht_cap_buf, memcpy(network->bssht.bd_ht_cap_buf,
...@@ -1877,7 +1877,7 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee, ...@@ -1877,7 +1877,7 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
*tmp_htinfo_len = min_t(u8, info_element->len, *tmp_htinfo_len = min_t(u8, info_element->len,
MAX_IE_LEN); MAX_IE_LEN);
if (*tmp_htinfo_len != 0) { if (*tmp_htinfo_len != 0) {
network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC; network->bssht.bd_ht_spec_ver = HT_SPEC_VER_EWC;
network->bssht.bd_ht_info_len = min_t(u16, *tmp_htinfo_len, network->bssht.bd_ht_info_len = min_t(u16, *tmp_htinfo_len,
sizeof(network->bssht.bd_ht_info_buf)); sizeof(network->bssht.bd_ht_info_buf));
memcpy(network->bssht.bd_ht_info_buf, memcpy(network->bssht.bd_ht_info_buf,
...@@ -2022,7 +2022,7 @@ static void rtllib_parse_mfie_ht_cap(struct rtllib_info_element *info_element, ...@@ -2022,7 +2022,7 @@ 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); *tmp_htcap_len = min_t(u8, info_element->len, MAX_IE_LEN);
if (*tmp_htcap_len != 0) { if (*tmp_htcap_len != 0) {
ht->bdHTSpecVer = HT_SPEC_VER_EWC; ht->bd_ht_spec_ver = HT_SPEC_VER_EWC;
ht->bd_ht_cap_len = min_t(u16, *tmp_htcap_len, ht->bd_ht_cap_len = min_t(u16, *tmp_htcap_len,
sizeof(ht->bd_ht_cap_buf)); sizeof(ht->bd_ht_cap_buf));
memcpy(ht->bd_ht_cap_buf, info_element->data, ht->bd_ht_cap_len); memcpy(ht->bd_ht_cap_buf, info_element->data, ht->bd_ht_cap_len);
...@@ -2234,7 +2234,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -2234,7 +2234,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
tmp_htinfo_len = min_t(u8, info_element->len, tmp_htinfo_len = min_t(u8, info_element->len,
MAX_IE_LEN); MAX_IE_LEN);
if (tmp_htinfo_len) { if (tmp_htinfo_len) {
network->bssht.bdHTSpecVer = HT_SPEC_VER_IEEE; network->bssht.bd_ht_spec_ver = HT_SPEC_VER_IEEE;
network->bssht.bd_ht_info_len = tmp_htinfo_len > network->bssht.bd_ht_info_len = tmp_htinfo_len >
sizeof(network->bssht.bd_ht_info_buf) ? sizeof(network->bssht.bd_ht_info_buf) ?
sizeof(network->bssht.bd_ht_info_buf) : sizeof(network->bssht.bd_ht_info_buf) :
...@@ -2466,7 +2466,7 @@ static inline void update_network(struct rtllib_device *ieee, ...@@ -2466,7 +2466,7 @@ static inline void update_network(struct rtllib_device *ieee,
dst->bssht.bd_ht_info_len = src->bssht.bd_ht_info_len; dst->bssht.bd_ht_info_len = src->bssht.bd_ht_info_len;
memcpy(dst->bssht.bd_ht_info_buf, src->bssht.bd_ht_info_buf, memcpy(dst->bssht.bd_ht_info_buf, src->bssht.bd_ht_info_buf,
src->bssht.bd_ht_info_len); src->bssht.bd_ht_info_len);
dst->bssht.bdHTSpecVer = src->bssht.bdHTSpecVer; dst->bssht.bd_ht_spec_ver = src->bssht.bd_ht_spec_ver;
dst->bssht.bdRT2RTLongSlotTime = src->bssht.bdRT2RTLongSlotTime; dst->bssht.bdRT2RTLongSlotTime = src->bssht.bdRT2RTLongSlotTime;
dst->broadcom_cap_exist = src->broadcom_cap_exist; dst->broadcom_cap_exist = src->broadcom_cap_exist;
dst->ralink_cap_exist = src->ralink_cap_exist; dst->ralink_cap_exist = src->ralink_cap_exist;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment