staging: rtl8723bs: rename ChannelNum to channel_num
PATCH 1/2 staging: rtl8723bs: rename ChannelNum to channel_num
Rename the CamelCase field ChannelNum of struct rt_channel_info to channel_num to conform to the Linux kernel coding style guidelines. This also fixes several checkpatch.pl warnings:
CHECK: Avoid CamelCase: <ChannelNum>
Signed-off-by Serhat Kumral <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 55 ++++++++++--------- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 2 +- 3 files changed, 31 insertions(+), 28 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +29 -26
@@ -172,12 +172,12 @@ int rtw_ch_set_search_ch(struct rt_channel_info *ch_set, const u32 ch) {int i; -for (i =0 ; ch_set[i].ChannelNum !=0 ; i++) { -if (ch == ch_set[i].ChannelNum) +for (i =0 ; ch_set[i].channel_num !=0 ; i++) { +if (ch == ch_set[i].channel_num)break ; } -if (i >= ch_set[i].ChannelNum) +if (i >= ch_set[i].channel_num)return -1 ;return i; }
@@ -262,7 +262,7 @@ static int has_channel(struct rt_channel_info *channel_set,int i;for (i =0 ; i < chanset_size; i++) -if (channel_set[i].ChannelNum == chan) +if (channel_set[i].channel_num == chan)return 1 ;return 0 ;
@@ -339,17 +339,20 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_cif (b2_4GBand) {for (index =0 ; index < RTW_ChannelPlan2G[Index2G].Len; index++) { - channel_set[chanset_size].ChannelNum = RTW_ChannelPlan2G[Index2G].Channel[index]; + channel_set[chanset_size].channel_num = + RTW_ChannelPlan2G[Index2G].Channel[index];if ((ChannelPlan ==RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN ) ||/* Channel 1~11 is active, and 12~14 is passive */ (ChannelPlan ==RT_CHANNEL_DOMAIN_GLOBAL_NULL )) { -if (channel_set[chanset_size].ChannelNum >=1 && channel_set[chanset_size].ChannelNum <=11 ) +if (channel_set[chanset_size].channel_num >=1 && + channel_set[chanset_size].channel_num <=11 ) channel_set[chanset_size].ScanType =SCAN_ACTIVE ; -else if ((channel_set[chanset_size].ChannelNum >=12 && channel_set[chanset_size].ChannelNum <=14 )) +else if (channel_set[chanset_size].channel_num >=12 && + channel_set[chanset_size].channel_num <=14 ) channel_set[chanset_size].ScanType =SCAN_PASSIVE ; }else if (ChannelPlan ==RT_CHANNEL_DOMAIN_WORLD_WIDE_13 || Index2G ==RT_CHANNEL_DOMAIN_2G_WORLD ) {/* channel 12~13, passive scan */ -if (channel_set[chanset_size].ChannelNum <=11 ) +if (channel_set[chanset_size].channel_num <=11 ) channel_set[chanset_size].ScanType =SCAN_ACTIVE ;else channel_set[chanset_size].ScanType =SCAN_PASSIVE ;
@@ -4173,26 +4176,26 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssidif (pregistrypriv->wireless_mode &WIRELESS_11G ) { do { if ((i == MAX_CHANNEL_NUM) || - (chplan_sta[i].ChannelNum == 0) || - (chplan_sta[i].ChannelNum > 14)) + (chplan_sta[i].channel_num == 0) || + (chplan_sta[i].channel_num > 14)) break; if ((j == chplan_ap.Len) || (chplan_ap.Channel[j] > 14)) break; - if (chplan_sta[i].ChannelNum == chplan_ap.Channel[j]) { - chplan_new[k].ChannelNum = chplan_ap.Channel[j]; + if (chplan_sta[i].channel_num == chplan_ap.Channel[j]) { + chplan_new[k].channel_num = chplan_ap.Channel[j]; chplan_new[k].ScanType = SCAN_ACTIVE; i++; j++; k++; - } else if (chplan_sta[i].ChannelNum < chplan_ap.Channel[j]) { - chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum; + } else if (chplan_sta[i].channel_num < chplan_ap.Channel[j]) { + chplan_new[k].channel_num = chplan_sta[i].channel_num; chplan_new[k].ScanType = SCAN_PASSIVE; i++; k++; - } else if (chplan_sta[i].ChannelNum > chplan_ap.Channel[j]) { - chplan_new[k].ChannelNum = chplan_ap.Channel[j]; + } else if (chplan_sta[i].channel_num > chplan_ap.Channel[j]) { + chplan_new[k].channel_num = chplan_ap.Channel[j]; chplan_new[k].ScanType = SCAN_ACTIVE; j++; k++;
@@ -4201,9 +4204,9 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid/* change AP not support channel to Passive scan */ while ((i <MAX_CHANNEL_NUM ) && - (chplan_sta[i].ChannelNum !=0 ) && - (chplan_sta[i].ChannelNum <=14 )) { - chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum; + (chplan_sta[i].channel_num !=0 ) && + (chplan_sta[i].channel_num <=14 )) { + chplan_new[k].channel_num = chplan_sta[i].channel_num; chplan_new[k].ScanType =SCAN_PASSIVE ; i++; k++;
@@ -4211,7 +4214,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid/* add channel AP supported */ while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] <=14 )) { - chplan_new[k].ChannelNum = chplan_ap.Channel[j]; + chplan_new[k].channel_num = chplan_ap.Channel[j]; chplan_new[k].ScanType =SCAN_ACTIVE ; j++; k++;
@@ -4219,9 +4222,9 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid }else {/* keep original STA 2.4G channel plan */ while ((i <MAX_CHANNEL_NUM ) && - (chplan_sta[i].ChannelNum !=0 ) && - (chplan_sta[i].ChannelNum <=14 )) { - chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum; + (chplan_sta[i].channel_num !=0 ) && + (chplan_sta[i].channel_num <=14 )) { + chplan_new[k].channel_num = chplan_sta[i].channel_num; chplan_new[k].ScanType = chplan_sta[i].ScanType; i++; k++;
@@ -4239,8 +4242,8 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid channel = bssid->configuration.ds_config; chplan_new = pmlmeext->channel_set; i =0 ; -while ((i <MAX_CHANNEL_NUM ) && (chplan_new[i].ChannelNum !=0 )) { -if (chplan_new[i].ChannelNum == channel) { +while ((i <MAX_CHANNEL_NUM ) && (chplan_new[i].channel_num !=0 )) { +if (chplan_new[i].channel_num == channel) {if (chplan_new[i].ScanType ==SCAN_PASSIVE ) chplan_new[i].ScanType =SCAN_ACTIVE ;break ;
@@ -5332,7 +5335,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_cbreak ; } - out[j].hw_value = pmlmeext->channel_set[i].ChannelNum; + out[j].hw_value = pmlmeext->channel_set[i].channel_num;if (pmlmeext->channel_set[i].ScanType ==SCAN_PASSIVE ) out[j].flags |=RTW_IEEE80211_CHAN_PASSIVE_SCAN ;
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
@@ -322,7 +322,7 @@ struct mlme_ext_info {/* The channel information about this channel including joining, scanning, and power constraints. */ struct rt_channel_info { -u8 ChannelNum;/* The channel number. */ +u8 channel_num;/* The channel number. */ enum rt_scan_type ScanType;/* Scan type such as passive or active scan. */ };
drivers/staging/rtl8723bs/os_dep/wifi_regd.c +1 -1
@@ -70,7 +70,7 @@ static void _rtw_reg_apply_flags(struct wiphy *wiphy)/* channels apply by channel plans. */ for (i =0 ; i < max_chan_nums; i++) { - channel = channel_set[i].ChannelNum; + channel = channel_set[i].channel_num; freq =rtw_ieee80211_channel_to_frequency (channel); ch =ieee80211_get_channel (wiphy, freq);if (ch) {
Signature · 1 line
2.54.0
PATCH 2/2 staging: rtl8723bs: rename ScanType to scan_type
Rename the CamelCase field ScanType of struct rt_channel_info, as well as the relevant local variables, to scan_type to conform to the Linux kernel coding style guidelines.
This also fixes several checkpatch.pl warnings:
CHECK: Avoid CamelCase: <ScanType>
Signed-off-by Serhat Kumral <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 37 ++++++++++--------- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +19 -18
@@ -346,18 +346,18 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c (ChannelPlan == RT_CHANNEL_DOMAIN_GLOBAL_NULL)) {if (channel_set[chanset_size].channel_num >=1 && channel_set[chanset_size].channel_num <=11 ) - channel_set[chanset_size].ScanType =SCAN_ACTIVE ; + channel_set[chanset_size].scan_type =SCAN_ACTIVE ;else if (channel_set[chanset_size].channel_num >=12 && channel_set[chanset_size].channel_num <=14 ) - channel_set[chanset_size].ScanType =SCAN_PASSIVE ; + channel_set[chanset_size].scan_type =SCAN_PASSIVE ; } else if (ChannelPlan == RT_CHANNEL_DOMAIN_WORLD_WIDE_13 || Index2G == RT_CHANNEL_DOMAIN_2G_WORLD) { /* channel 12~13, passive scan */if (channel_set[chanset_size].channel_num <=11 ) - channel_set[chanset_size].ScanType =SCAN_ACTIVE ; + channel_set[chanset_size].scan_type =SCAN_ACTIVE ;else - channel_set[chanset_size].ScanType =SCAN_PASSIVE ; + channel_set[chanset_size].scan_type =SCAN_PASSIVE ; } else - channel_set[chanset_size].ScanType = SCAN_ACTIVE; + channel_set[chanset_size].scan_type = SCAN_ACTIVE; chanset_size++; }
@@ -3689,7 +3689,7 @@ unsigned int send_beacon(struct adapter *padapter)void site_survey (struct adapter *padapter) {unsigned char survey_channel =0 , val8; -enum rt_scan_type ScanType =SCAN_PASSIVE ; +enum rt_scan_type scan_type =SCAN_PASSIVE ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u32 initialgain =0 ;
@@ -3701,7 +3701,8 @@ void site_survey(struct adapter *padapter)if (pmlmeext->sitesurvey_res.channel_idx < pmlmeext->sitesurvey_res.ch_num) { ch = &pmlmeext->sitesurvey_res.ch[pmlmeext->sitesurvey_res.channel_idx]; survey_channel = ch->hw_value; - ScanType = (ch->flags &RTW_IEEE80211_CHAN_PASSIVE_SCAN ) ?SCAN_PASSIVE :SCAN_ACTIVE ; + scan_type = (ch->flags &RTW_IEEE80211_CHAN_PASSIVE_SCAN ) ? +SCAN_PASSIVE :SCAN_ACTIVE ; } }
@@ -3712,7 +3713,7 @@ void site_survey(struct adapter *padapter)else r8723bs_select_channel (padapter, survey_channel); -if (ScanType ==SCAN_ACTIVE ) {/* obey the channel plan setting... */ +if (scan_type ==SCAN_ACTIVE ) {/* obey the channel plan setting... */ {int i;
@@ -4185,18 +4186,18 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssidif (chplan_sta[i].channel_num == chplan_ap.Channel[j]) { chplan_new[k].channel_num = chplan_ap.Channel[j]; - chplan_new[k].ScanType =SCAN_ACTIVE ; + chplan_new[k].scan_type =SCAN_ACTIVE ; i++; j++; k++; }else if (chplan_sta[i].channel_num < chplan_ap.Channel[j]) { chplan_new[k].channel_num = chplan_sta[i].channel_num; - chplan_new[k].ScanType =SCAN_PASSIVE ; + chplan_new[k].scan_type =SCAN_PASSIVE ; i++; k++; }else if (chplan_sta[i].channel_num > chplan_ap.Channel[j]) { chplan_new[k].channel_num = chplan_ap.Channel[j]; - chplan_new[k].ScanType =SCAN_ACTIVE ; + chplan_new[k].scan_type =SCAN_ACTIVE ; j++; k++; }
@@ -4207,7 +4208,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid (chplan_sta[i].channel_num != 0) && (chplan_sta[i].channel_num <= 14)) { chplan_new[k].channel_num = chplan_sta[i].channel_num; - chplan_new[k].ScanType =SCAN_PASSIVE ; + chplan_new[k].scan_type =SCAN_PASSIVE ; i++; k++; }
@@ -4215,7 +4216,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid/* add channel AP supported */ while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] <=14 )) { chplan_new[k].channel_num = chplan_ap.Channel[j]; - chplan_new[k].ScanType =SCAN_ACTIVE ; + chplan_new[k].scan_type =SCAN_ACTIVE ; j++; k++; }
@@ -4225,7 +4226,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid (chplan_sta[i].channel_num != 0) && (chplan_sta[i].channel_num <= 14)) { chplan_new[k].channel_num = chplan_sta[i].channel_num; - chplan_new[k].ScanType = chplan_sta[i].ScanType; + chplan_new[k].scan_type = chplan_sta[i].scan_type; i++; k++; }
@@ -4244,8 +4245,8 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid i =0 ;while ((i <MAX_CHANNEL_NUM ) && (chplan_new[i].channel_num !=0 )) {if (chplan_new[i].channel_num == channel) { -if (chplan_new[i].ScanType ==SCAN_PASSIVE ) - chplan_new[i].ScanType =SCAN_ACTIVE ; +if (chplan_new[i].scan_type ==SCAN_PASSIVE ) + chplan_new[i].scan_type =SCAN_ACTIVE ;break ; } i++;
@@ -5315,7 +5316,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_cmemcpy (&out[j], &in[i],sizeof (struct rtw_ieee80211_channel )); -if (pmlmeext->channel_set[set_idx].ScanType ==SCAN_PASSIVE ) +if (pmlmeext->channel_set[set_idx].scan_type ==SCAN_PASSIVE ) out[j].flags |=RTW_IEEE80211_CHAN_PASSIVE_SCAN ; j++;
@@ -5337,7 +5338,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c out[j].hw_value = pmlmeext->channel_set[i].channel_num; -if (pmlmeext->channel_set[i].ScanType ==SCAN_PASSIVE ) +if (pmlmeext->channel_set[i].scan_type ==SCAN_PASSIVE ) out[j].flags |=RTW_IEEE80211_CHAN_PASSIVE_SCAN ; j++;
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
@@ -323,7 +323,7 @@ struct mlme_ext_info {/* The channel information about this channel including joining, scanning, and power constraints. */ struct rt_channel_info {u8 channel_num;/* The channel number. */ -enum rt_scan_type ScanType;/* Scan type such as passive or active scan. */ +enum rt_scan_type scan_type;/* Scan type such as passive or active scan. */ };int rtw_ch_set_search_ch (struct rt_channel_info *ch_set,const u32 ch);
drivers/staging/rtl8723bs/os_dep/wifi_regd.c +1 -1
@@ -74,7 +74,7 @@ static void _rtw_reg_apply_flags(struct wiphy *wiphy) freq =rtw_ieee80211_channel_to_frequency (channel); ch =ieee80211_get_channel (wiphy, freq);if (ch) { -if (channel_set[i].ScanType ==SCAN_PASSIVE ) +if (channel_set[i].scan_type ==SCAN_PASSIVE ) ch->flags =IEEE80211_CHAN_NO_IR ;else ch->flags =0 ;
Signature · 1 line
2.54.0