mirror of
https://github.com/torvalds/linux.git
synced 2024-12-20 10:01:56 +00:00
staging: rtl8192e: rename bdHTInfoLen to bd_ht_info_len in bss_ht struct
Rename bdHTInfoLen to bd_ht_info_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-7-will+git@drnd.me Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
2408ee9e3c
commit
060d3f6cb8
@ -184,7 +184,7 @@ struct bss_ht {
|
||||
u8 bd_ht_cap_buf[32];
|
||||
u16 bd_ht_cap_len;
|
||||
u8 bd_ht_info_buf[32];
|
||||
u16 bdHTInfoLen;
|
||||
u16 bd_ht_info_len;
|
||||
|
||||
enum ht_spec_ver bdHTSpecVer;
|
||||
enum ht_channel_width bdBandWidth;
|
||||
|
@ -693,7 +693,7 @@ void HTInitializeBssDesc(struct bss_ht *pBssHT)
|
||||
memset(pBssHT->bd_ht_cap_buf, 0, sizeof(pBssHT->bd_ht_cap_buf));
|
||||
pBssHT->bd_ht_cap_len = 0;
|
||||
memset(pBssHT->bd_ht_info_buf, 0, sizeof(pBssHT->bd_ht_info_buf));
|
||||
pBssHT->bdHTInfoLen = 0;
|
||||
pBssHT->bd_ht_info_len = 0;
|
||||
|
||||
pBssHT->bdHTSpecVer = HT_SPEC_VER_IEEE;
|
||||
|
||||
@ -722,12 +722,12 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
|
||||
pNetwork->bssht.bd_ht_cap_buf,
|
||||
pNetwork->bssht.bd_ht_cap_len);
|
||||
|
||||
if (pNetwork->bssht.bdHTInfoLen > 0 &&
|
||||
pNetwork->bssht.bdHTInfoLen <=
|
||||
if (pNetwork->bssht.bd_ht_info_len > 0 &&
|
||||
pNetwork->bssht.bd_ht_info_len <=
|
||||
sizeof(pHTInfo->PeerHTInfoBuf))
|
||||
memcpy(pHTInfo->PeerHTInfoBuf,
|
||||
pNetwork->bssht.bd_ht_info_buf,
|
||||
pNetwork->bssht.bdHTInfoLen);
|
||||
pNetwork->bssht.bd_ht_info_len);
|
||||
|
||||
if (pHTInfo->bRegRT2RTAggregation) {
|
||||
pHTInfo->bCurrentRT2RTAggregation =
|
||||
@ -786,7 +786,7 @@ void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
|
||||
(struct ht_info_ele *)pNetwork->bssht.bd_ht_info_buf;
|
||||
|
||||
if (pHTInfo->bCurrentHTSupport) {
|
||||
if (pNetwork->bssht.bdHTInfoLen != 0)
|
||||
if (pNetwork->bssht.bd_ht_info_len != 0)
|
||||
pHTInfo->CurrentOpMode = pPeerHTInfo->OptMode;
|
||||
}
|
||||
}
|
||||
|
@ -1878,11 +1878,11 @@ 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,
|
||||
network->bssht.bd_ht_info_len = 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);
|
||||
network->bssht.bd_ht_info_len);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2235,13 +2235,13 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
|
||||
MAX_IE_LEN);
|
||||
if (tmp_htinfo_len) {
|
||||
network->bssht.bdHTSpecVer = HT_SPEC_VER_IEEE;
|
||||
network->bssht.bdHTInfoLen = 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) :
|
||||
tmp_htinfo_len;
|
||||
memcpy(network->bssht.bd_ht_info_buf,
|
||||
info_element->data,
|
||||
network->bssht.bdHTInfoLen);
|
||||
network->bssht.bd_ht_info_len);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -2463,9 +2463,9 @@ static inline void update_network(struct rtllib_device *ieee,
|
||||
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.bd_ht_cap_len);
|
||||
dst->bssht.bdHTInfoLen = src->bssht.bdHTInfoLen;
|
||||
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,
|
||||
src->bssht.bdHTInfoLen);
|
||||
src->bssht.bd_ht_info_len);
|
||||
dst->bssht.bdHTSpecVer = src->bssht.bdHTSpecVer;
|
||||
dst->bssht.bdRT2RTLongSlotTime = src->bssht.bdRT2RTLongSlotTime;
|
||||
dst->broadcom_cap_exist = src->broadcom_cap_exist;
|
||||
|
@ -2242,7 +2242,7 @@ rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb,
|
||||
network->bssht.bd_ht_cap_len);
|
||||
memcpy(ieee->pHTInfo->PeerHTInfoBuf,
|
||||
network->bssht.bd_ht_info_buf,
|
||||
network->bssht.bdHTInfoLen);
|
||||
network->bssht.bd_ht_info_len);
|
||||
if (ieee->handle_assoc_response != NULL)
|
||||
ieee->handle_assoc_response(ieee->dev,
|
||||
(struct rtllib_assoc_response_frame *)header,
|
||||
|
Loading…
Reference in New Issue
Block a user