staging: rtl8723bs: rename supportRateNum to support_rate_num
PATCH 1/1 staging: rtl8723bs: rename supportRateNum to support_rate_num
Rename supportRateNum to support_rate_num to fix warning reported by checkpatch.pl.
Signed-off-by Esther Zilberberg <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 16 ++++++++-------- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 18 +++++++++--------- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 8 ++++---- 3 files changed, 21 insertions(+), 21 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +8 -8
@@ -368,7 +368,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)void update_bmc_sta (struct adapter *padapter) {unsigned char network_type; -int supportRateNum =0 ; +int support_rate_num =0 ;unsigned int tx_ra_bitmap =0 ;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@@ -392,9 +392,9 @@ void update_bmc_sta(struct adapter *padapter)memset ((void *)&psta->sta_stats,0 ,sizeof (struct stainfo_stats ));/* prepare for add_RATid */ - supportRateNum =rtw_get_rateset_len ((u8 *)&pcur_network->supported_rates); + support_rate_num =rtw_get_rateset_len ((u8 *)&pcur_network->supported_rates); network_type =rtw_check_network_type ((u8 *)&pcur_network->supported_rates, - supportRateNum, + support_rate_num, pcur_network->configuration.ds_config );if (is_supported_tx_cck (network_type)) {
@@ -808,7 +808,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)uint ie_len =0 ;int group_cipher, pairwise_cipher;u8 channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX ]; -int supportRateNum =0 ; +int support_rate_num =0 ;u8 OUI1 [] = {0x00 ,0x50 ,0xf2 ,0x01 };u8 WMM_PARA_IE [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 };struct registry_priv *pregistrypriv = &padapter->registrypriv;
@@ -878,7 +878,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) (pbss_network->ie_length - _BEACON_IE_OFFSET_));if (p) {memcpy (supportRate, p +2 , ie_len); - supportRateNum = ie_len; + support_rate_num = ie_len; }/* get ext_supported rates */
@@ -887,11 +887,11 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_);if (p) { -memcpy (supportRate + supportRateNum, p +2 , ie_len); - supportRateNum += ie_len; +memcpy (supportRate + support_rate_num, p +2 , ie_len); + support_rate_num += ie_len; } - network_type =rtw_check_network_type (supportRate, supportRateNum, channel); + network_type =rtw_check_network_type (supportRate, support_rate_num, channel);rtw_set_supported_rate (pbss_network->supported_rates, network_type);
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +9 -9
@@ -938,7 +938,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)unsigned char WMM_IE [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x00 ,0x01 };int i, ie_len, wpa_ie_len, left;unsigned char supportRate[16 ]; -int supportRateNum; +int support_rate_num;unsigned short status =WLAN_STATUS_SUCCESS ;unsigned short frame_type, ie_offset =0 ;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -1025,7 +1025,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)if (!p) {/* use our own rate set as statoin used */ /* memcpy(supportRate, AP_BSSRATE, AP_BSSRATE_LEN); */ -/* supportRateNum = AP_BSSRATE_LEN; */ +/* support_rate_num = AP_BSSRATE_LEN; */ status =WLAN_STATUS_CHALLENGE_FAIL ; goto OnAssocReqFail;
@@ -1034,25 +1034,25 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) ie_len =sizeof (supportRate);memcpy (supportRate, p+2 , ie_len); - supportRateNum = ie_len; + support_rate_num = ie_len; p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + ie_offset,WLAN_EID_EXT_SUPP_RATES , &ie_len, pkt_len -WLAN_HDR_A3_LEN - ie_offset);if (p) { -if (supportRateNum + ie_len <=sizeof (supportRate)) { -memcpy (supportRate+supportRateNum, p+2 , ie_len); - supportRateNum += ie_len; +if (support_rate_num + ie_len <=sizeof (supportRate)) { +memcpy (supportRate+support_rate_num, p+2 , ie_len); + support_rate_num += ie_len; } } }/* todo: mask supportRate between AP & STA -> move to update raid */ -/* get_matched_rate(pmlmeext, supportRate, &supportRateNum, 0); */ +/* get_matched_rate(pmlmeext, supportRate, &support_rate_num, 0); */ /* update station supportRate */ - pstat->bssratelen = supportRateNum; -memcpy (pstat->bssrateset, supportRate, supportRateNum); + pstat->bssratelen = support_rate_num; +memcpy (pstat->bssrateset, supportRate, support_rate_num);update_basic_rate_table_soft_ap (pstat->bssrateset, pstat->bssratelen);/* check RSN/WPA/WPS */
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +4 -4
@@ -1596,7 +1596,7 @@ int update_sta_support_rate(struct adapter *padapter, u8 *pvar_ie, uint var_ie_l {unsigned int ie_len;struct ndis_80211_var_ie *pIE; -int supportRateNum =0 ; +int support_rate_num =0 ;struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@@ -1607,11 +1607,11 @@ int update_sta_support_rate(struct adapter *padapter, u8 *pvar_ie, uint var_ie_lreturn _FAIL;memcpy (pmlmeinfo->FW_sta_info[cam_idx].SupportedRates, pIE->data, ie_len); - supportRateNum = ie_len; + support_rate_num = ie_len; pIE = (struct ndis_80211_var_ie *)rtw_get_ie (pvar_ie,WLAN_EID_EXT_SUPP_RATES , &ie_len, var_ie_len); -if (pIE && (ie_len <=sizeof (pmlmeinfo->FW_sta_info[cam_idx].SupportedRates) - supportRateNum)) -memcpy ((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + supportRateNum), pIE->data, ie_len); +if (pIE && (ie_len <=sizeof (pmlmeinfo->FW_sta_info[cam_idx].SupportedRates) - support_rate_num)) +memcpy ((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + support_rate_num), pIE->data, ie_len);return _SUCCESS; }
Signature · 1 line
2.43.0
Greg KH
maintainerQuoted 9 lines · Esther Zilberberg
Rename supportRateNum to
support_rate_numto fix warning reported by checkpatch.pl.Signed-off-by Esther Zilberberg <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_ap.c | 16 ++++++++-------- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 18 +++++++++--------- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 8 ++++---- 3 files changed, 21 insertions(+), 21 deletions(-)
Does not apply to 7.0-rc1 :(