Commit 2408ee9e authored by William Durand's avatar William Durand Committed by Greg Kroah-Hartman

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: 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-6-will+git@drnd.meSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 20e90635
...@@ -183,7 +183,7 @@ struct bss_ht { ...@@ -183,7 +183,7 @@ struct bss_ht {
u8 bd_ht_cap_buf[32]; u8 bd_ht_cap_buf[32];
u16 bd_ht_cap_len; u16 bd_ht_cap_len;
u8 bdHTInfoBuf[32]; u8 bd_ht_info_buf[32];
u16 bdHTInfoLen; u16 bdHTInfoLen;
enum ht_spec_ver bdHTSpecVer; enum ht_spec_ver bdHTSpecVer;
......
...@@ -692,7 +692,7 @@ void HTInitializeBssDesc(struct bss_ht *pBssHT) ...@@ -692,7 +692,7 @@ void HTInitializeBssDesc(struct bss_ht *pBssHT)
pBssHT->bd_support_ht = false; pBssHT->bd_support_ht = false;
memset(pBssHT->bd_ht_cap_buf, 0, sizeof(pBssHT->bd_ht_cap_buf)); memset(pBssHT->bd_ht_cap_buf, 0, sizeof(pBssHT->bd_ht_cap_buf));
pBssHT->bd_ht_cap_len = 0; 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->bdHTInfoLen = 0;
pBssHT->bdHTSpecVer = HT_SPEC_VER_IEEE; pBssHT->bdHTSpecVer = HT_SPEC_VER_IEEE;
...@@ -726,7 +726,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, ...@@ -726,7 +726,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
pNetwork->bssht.bdHTInfoLen <= pNetwork->bssht.bdHTInfoLen <=
sizeof(pHTInfo->PeerHTInfoBuf)) sizeof(pHTInfo->PeerHTInfoBuf))
memcpy(pHTInfo->PeerHTInfoBuf, memcpy(pHTInfo->PeerHTInfoBuf,
pNetwork->bssht.bdHTInfoBuf, pNetwork->bssht.bd_ht_info_buf,
pNetwork->bssht.bdHTInfoLen); pNetwork->bssht.bdHTInfoLen);
if (pHTInfo->bRegRT2RTAggregation) { if (pHTInfo->bRegRT2RTAggregation) {
...@@ -783,7 +783,7 @@ void HT_update_self_and_peer_setting(struct rtllib_device *ieee, ...@@ -783,7 +783,7 @@ void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
{ {
struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
struct ht_info_ele *pPeerHTInfo = 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 (pHTInfo->bCurrentHTSupport) {
if (pNetwork->bssht.bdHTInfoLen != 0) if (pNetwork->bssht.bdHTInfoLen != 0)
......
...@@ -1878,8 +1878,9 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee, ...@@ -1878,8 +1878,9 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
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.bdHTSpecVer = HT_SPEC_VER_EWC;
network->bssht.bdHTInfoLen = min_t(u16, *tmp_htinfo_len, sizeof(network->bssht.bdHTInfoBuf)); network->bssht.bdHTInfoLen = min_t(u16, *tmp_htinfo_len,
memcpy(network->bssht.bdHTInfoBuf, sizeof(network->bssht.bd_ht_info_buf));
memcpy(network->bssht.bd_ht_info_buf,
info_element->data, info_element->data,
network->bssht.bdHTInfoLen); network->bssht.bdHTInfoLen);
} }
...@@ -2235,10 +2236,10 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -2235,10 +2236,10 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
if (tmp_htinfo_len) { if (tmp_htinfo_len) {
network->bssht.bdHTSpecVer = HT_SPEC_VER_IEEE; network->bssht.bdHTSpecVer = HT_SPEC_VER_IEEE;
network->bssht.bdHTInfoLen = tmp_htinfo_len > network->bssht.bdHTInfoLen = tmp_htinfo_len >
sizeof(network->bssht.bdHTInfoBuf) ? sizeof(network->bssht.bd_ht_info_buf) ?
sizeof(network->bssht.bdHTInfoBuf) : sizeof(network->bssht.bd_ht_info_buf) :
tmp_htinfo_len; tmp_htinfo_len;
memcpy(network->bssht.bdHTInfoBuf, memcpy(network->bssht.bd_ht_info_buf,
info_element->data, info_element->data,
network->bssht.bdHTInfoLen); network->bssht.bdHTInfoLen);
} }
...@@ -2463,7 +2464,7 @@ static inline void update_network(struct rtllib_device *ieee, ...@@ -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, memcpy(dst->bssht.bd_ht_cap_buf, src->bssht.bd_ht_cap_buf,
src->bssht.bd_ht_cap_len); src->bssht.bd_ht_cap_len);
dst->bssht.bdHTInfoLen = src->bssht.bdHTInfoLen; 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); src->bssht.bdHTInfoLen);
dst->bssht.bdHTSpecVer = src->bssht.bdHTSpecVer; dst->bssht.bdHTSpecVer = src->bssht.bdHTSpecVer;
dst->bssht.bdRT2RTLongSlotTime = src->bssht.bdRT2RTLongSlotTime; dst->bssht.bdRT2RTLongSlotTime = src->bssht.bdRT2RTLongSlotTime;
......
...@@ -2241,7 +2241,7 @@ rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -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_buf,
network->bssht.bd_ht_cap_len); network->bssht.bd_ht_cap_len);
memcpy(ieee->pHTInfo->PeerHTInfoBuf, memcpy(ieee->pHTInfo->PeerHTInfoBuf,
network->bssht.bdHTInfoBuf, network->bssht.bd_ht_info_buf,
network->bssht.bdHTInfoLen); network->bssht.bdHTInfoLen);
if (ieee->handle_assoc_response != NULL) if (ieee->handle_assoc_response != NULL)
ieee->handle_assoc_response(ieee->dev, ieee->handle_assoc_response(ieee->dev,
......
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