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.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 18 +++++++++--------- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +9 -9
@@ -935,7 +935,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;
@@ -1022,7 +1022,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;
@@ -1031,25 +1031,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
@@ -1593,7 +1593,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);
@@ -1604,11 +1604,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
Quoted 8 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_mlme_ext.c | 18 +++++++++--------- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-)
Which branch are you using?
Thanks,
ET
Quoted 11 lines · Ethan Tidmore
Quoted 8 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_mlme_ext.c | 18 +++++++++--------- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-)
Quoted 5 lines
Which branch are you using?
Thanks,
ET
I am using the mainline (master) branch.
Thanks,
Esther
Quoted 8 lines · Esther Zilberberg
Quoted 7 lines · Ethan Tidmore
Quoted 5 lines · Esther Zilberberg
Rename supportRateNum to
support_rate_numto fix warning reported by checkpatch.pl.Signed-off-by Esther Zilberberg <[email protected]>---
...
Quoted 4 lines
I am using the mainline (master) branch.
Thanks,
Esther
When I tried to apply this patch against staging-next it didn't apply cleanly, so try and rebase it against staging-next.
Thanks,
ET
Quoted 18 lines · Ethan Tidmore
Quoted 8 lines · Esther Zilberberg
Quoted 7 lines · Ethan Tidmore
Quoted 5 lines · Esther Zilberberg
Rename supportRateNum to
support_rate_numto fix warning reported by checkpatch.pl.Signed-off-by Esther Zilberberg <[email protected]>---
...
Quoted 4 lines
I am using the mainline (master) branch.
Thanks,
Esther
Quoted 6 lines
When I tried to apply this patch against staging-next it didn't apply cleanly, so try and rebase it against staging-next.
Thanks,
ET
Hi,
I have rebased the patch on staging-next and sent v2:
https://lore.kernel.org/linux-staging/[email protected]/T/#u
Thanks,
Esther