staging: rtl8723bs: rtw_mlme: fix long lines and related issues
Subsystems (2)
v3 cover staging: rtl8723bs: rtw_mlme: fix long lines and related issues
This series addresses review feedback on v2 of the rtw_mlme.c line length cleanup patch.
Patch 1 fixes a pre-existing buffer over-read bug in rtw_update_protection() identified during review.
Patches 2-5 address the line length cleanup, dead code removal, line consolidation, and readability improvements as separate atomic changes.
Salman Alghamdi (5):
staging: rtl8723bs: fix buffer over-read in rtw_update_protection
staging: rtl8723bs: rtw_mlme: fix lines exceeding 100 columns
staging: rtl8723bs: rtw_mlme: remove dead commented-out code
staging: rtl8723bs: rtw_mlme: consolidate capability comparisons lines
staging: rtl8723bs: rtw_mlme: add blank line for readability
drivers/staging/rtl8723bs/core/rtw_mlme.c | 286 +++++++++++++++------- 1 file changed, 197 insertions(+), 89 deletions(-)
Signature · 1 line
2.54.0
PATCH v3 1/5 staging: rtl8723bs: fix buffer over-read in rtw_update_protection
rtw_update_protection() is called with a pointer offset into the ies buffer but the full ie_length is passed, causing a potential buffer over-read.
Fixes e945c43df60b ("Staging: rtl8723bs: Delete dead code from update_current_network()")
Fixes d3fcee1b78a5 ("staging: rtl8723bs: fix camel case in struct wlan_bssid_ex")
Reported-by Luka Gejak <[email protected]>
Signed-off-by Salman Alghamdi <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +8 -2
@@ -464,8 +464,11 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_exif (check_fwstate (pmlmepriv, _FW_LINKED) && (is_same_network (&pmlmepriv->cur_network.network, pnetwork,0 ))) {update_network (&pmlmepriv->cur_network.network, pnetwork, adapter, true); +if (pmlmepriv->cur_network.network.ie_length <sizeof (struct ndis_802_11_fix_ie )) +return ; +rtw_update_protection (adapter, (pmlmepriv->cur_network.network.ies) +sizeof (struct ndis_802_11_fix_ie ), - pmlmepriv->cur_network.network.ie_length); + pmlmepriv->cur_network.network.ie_length -sizeof (struct ndis_802_11_fix_ie )); } }
@@ -1072,8 +1075,11 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netbreak ; } +if (cur_network->network.ie_length <sizeof (struct ndis_802_11_fix_ie )) +return ; +rtw_update_protection (padapter, (cur_network->network.ies) +sizeof (struct ndis_802_11_fix_ie ), - (cur_network->network.ie_length)); + (cur_network->network.ie_length -sizeof (struct ndis_802_11_fix_ie )));rtw_update_ht_cap (padapter, cur_network->network.ies, cur_network->network.ie_length, (u8 ) cur_network->network.configuration.ds_config); }
Signature · 1 line
2.54.0
PATCH v3 2/5 staging: rtl8723bs: rtw_mlme: fix lines exceeding 100 columns
In reply to Salman AlghamdiWrap long lines and extract local variables to bring all lines within the 100 column limit.
Signed-off-by Salman Alghamdi <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 284 +++++++++++++++------- 1 file changed, 201 insertions(+), 83 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +201 -83
@@ -52,7 +52,10 @@ int rtw_init_mlme_priv(struct adapter *padapter) pmlmepriv->pscanned =NULL ; pmlmepriv->fw_state =WIFI_STATION_STATE ;/* Must sync with rtw_wdev_alloc() */ pmlmepriv->cur_network.network.infrastructure_mode = Ndis802_11AutoUnknown; - pmlmepriv->scan_mode =SCAN_ACTIVE ;/* 1: active, 0: passive. Maybe someday we should rename this varable to "active_mode" (Jeff) */ +/* 1: active, 0: passive. Maybe someday we should rename +* this varable to "active_mode" (Jeff) +*/ + pmlmepriv->scan_mode =SCAN_ACTIVE ;spin_lock_init (&pmlmepriv->lock);INIT_LIST_HEAD (&pmlmepriv->free_bss_pool.queue);
@@ -125,7 +128,8 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)rtw_free_mlme_ie_data (&pmlmepriv->p2p_beacon_ie, &pmlmepriv->p2p_beacon_ie_len);rtw_free_mlme_ie_data (&pmlmepriv->p2p_probe_req_ie, &pmlmepriv->p2p_probe_req_ie_len);rtw_free_mlme_ie_data (&pmlmepriv->p2p_probe_resp_ie, &pmlmepriv->p2p_probe_resp_ie_len); -rtw_free_mlme_ie_data (&pmlmepriv->p2p_go_probe_resp_ie, &pmlmepriv->p2p_go_probe_resp_ie_len); +rtw_free_mlme_ie_data (&pmlmepriv->p2p_go_probe_resp_ie, + &pmlmepriv->p2p_go_probe_resp_ie_len);rtw_free_mlme_ie_data (&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc_req_ie_len); }
@@ -369,7 +373,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea (d_cap & WLAN_CAPABILITY_ESS)); } -struct wlan_network *_rtw_find_same_network (struct __queue *scanned_queue,struct wlan_network *network) +struct wlan_network *_rtw_find_same_network (struct __queue *scanned_queue, +struct wlan_network *network) {struct list_head *phead, *plist;struct wlan_network *found =NULL ;
@@ -420,7 +425,8 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,long rssi_final;/* The rule below is 1/5 for sample value, 4/5 for history value */ -if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) &&is_same_network (&padapter->mlmepriv.cur_network.network, src,0 )) { +if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) && +is_same_network (&padapter->mlmepriv.cur_network.network, src,0 )) {/* Take the recvpriv's value for the connected AP*/ ss_final = padapter->recvpriv.signal_strength; sq_final = padapter->recvpriv.signal_qual;
@@ -431,11 +437,15 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, rssi_final = rssi_ori; }else {if (sq_smp !=101 ) {/* from the right channel */ - ss_final = ((u32)(src->phy_info.signal_strength) + (u32)(dst->phy_info.signal_strength) *4 ) /5 ; - sq_final = ((u32)(src->phy_info.signal_quality) + (u32)(dst->phy_info.signal_quality) *4 ) /5 ; + ss_final = ((u32)(src->phy_info.signal_strength) + + (u32)(dst->phy_info.signal_strength) *4 ) /5 ; + sq_final = ((u32)(src->phy_info.signal_quality) + + (u32)(dst->phy_info.signal_quality) *4 ) /5 ; rssi_final = (src->rssi + dst->rssi *4 ) /5 ; }else { -/* bss info not receiving from the right channel, use the original RX signal infos */ +/* bss info not receiving from the right channel, use +* the original RX signal infos +*/ ss_final = dst->phy_info.signal_strength; sq_final = dst->phy_info.signal_quality; rssi_final = dst->rssi;
@@ -462,13 +472,18 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex &pmlmepriv->cur_network.network, &pmlmepriv->cur_network.network); -if (check_fwstate (pmlmepriv, _FW_LINKED) && (is_same_network (&pmlmepriv->cur_network.network, pnetwork,0 ))) { +if (check_fwstate (pmlmepriv, _FW_LINKED) && + (is_same_network (&pmlmepriv->cur_network.network, pnetwork,0 ))) { +u32 ie_len; +u8 *ie; +update_network (&pmlmepriv->cur_network.network, pnetwork, adapter, true); -if (pmlmepriv->cur_network.network.ie_length <sizeof (struct ndis_802_11_fix_ie )) + ie_len = pmlmepriv->cur_network.network.ie_length; +if (ie_len <sizeof (struct ndis_802_11_fix_ie ))return ; -rtw_update_protection (adapter, (pmlmepriv->cur_network.network.ies) +sizeof (struct ndis_802_11_fix_ie ), - pmlmepriv->cur_network.network.ie_length -sizeof (struct ndis_802_11_fix_ie )); + ie = pmlmepriv->cur_network.network.ies +sizeof (struct ndis_802_11_fix_ie ); +rtw_update_protection (adapter, ie, ie_len -sizeof (struct ndis_802_11_fix_ie )); } }
@@ -604,7 +619,16 @@ static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network privacy = pnetwork->network.privacy;if (check_fwstate (pmlmepriv,WIFI_UNDER_WPS )) { -if (rtw_get_wps_ie (pnetwork->network.ies + _FIXED_IE_LENGTH_, pnetwork->network.ie_length - _FIXED_IE_LENGTH_,NULL , &wps_ielen)) +u8 *ie_ptr; +u32 ie_len_val; + +if (pnetwork->network.ie_length < _FIXED_IE_LENGTH_) +return false; + + ie_ptr = pnetwork->network.ies + _FIXED_IE_LENGTH_; + ie_len_val = pnetwork->network.ie_length - _FIXED_IE_LENGTH_; + +if (rtw_get_wps_ie (ie_ptr, ie_len_val,NULL , &wps_ielen))return true;else return false;
@@ -617,11 +641,20 @@ static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network bselected = false;if (psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPA2PSK) { - p =rtw_get_ie (pnetwork->network.ies + _BEACON_IE_OFFSET_,WLAN_EID_RSN , &ie_len, (pnetwork->network.ie_length - _BEACON_IE_OFFSET_)); -if (p && ie_len >0 ) - bselected = true; -else +u8 *ie_ptr; +u32 ie_len_val; + +if (pnetwork->network.ie_length < _BEACON_IE_OFFSET_) { bselected = false; + }else { + ie_ptr = pnetwork->network.ies + _BEACON_IE_OFFSET_; + ie_len_val = pnetwork->network.ie_length - _BEACON_IE_OFFSET_; + p =rtw_get_ie (ie_ptr,WLAN_EID_RSN , &ie_len, ie_len_val); +if (p && ie_len >0 ) + bselected = true; +else + bselected = false; + } } }
@@ -629,7 +662,13 @@ static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network bselected = false;if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) { -if (pnetwork->network.infrastructure_mode != pmlmepriv->cur_network.network.infrastructure_mode) +enum ndis_802_11_network_infrastructure inf_mode; +enum ndis_802_11_network_infrastructure cur_inf; + + inf_mode = pnetwork->network.infrastructure_mode; + cur_inf = pmlmepriv->cur_network.network.infrastructure_mode; + +if (inf_mode != cur_inf) bselected = false; }
@@ -657,12 +696,14 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)/* update IBSS_network 's timestamp */ if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) { -if (!memcmp (&pmlmepriv->cur_network.network.mac_address, pnetwork->mac_address,ETH_ALEN )) { +if (!memcmp (&pmlmepriv->cur_network.network.mac_address, + pnetwork->mac_address,ETH_ALEN )) {struct wlan_network *ibss_wlan =NULL ;memcpy (pmlmepriv->cur_network.network.ies, pnetwork->ies,8 );spin_lock_bh (&pmlmepriv->scanned_queue.lock); - ibss_wlan =rtw_find_network (&pmlmepriv->scanned_queue, pnetwork->mac_address); + ibss_wlan =rtw_find_network (&pmlmepriv->scanned_queue, + pnetwork->mac_address);if (ibss_wlan) {memcpy (ibss_wlan->network.ies, pnetwork->ies,8 );spin_unlock_bh (&pmlmepriv->scanned_queue.lock);
@@ -713,13 +754,17 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)_set_timer (&pmlmepriv->assoc_timer,MAX_JOIN_TIMEOUT ); }else {u8 ret = _SUCCESS; -struct wlan_bssid_ex *pdev_network = &adapter->registrypriv.dev_network; -u8 *pibss = adapter->registrypriv.dev_network.mac_address; +struct registry_priv *regs = &adapter->registrypriv; +struct wlan_bssid_ex *pdev_network = ®s->dev_network; +u8 *pibss = regs->dev_network.mac_address; -/* pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;because don't set assoc_timer */ +/* pmlmepriv->fw_state ^= _FW_UNDER_SURVEY; +* because don't set assoc_timer +*/ _clr_fwstate_ (pmlmepriv, _FW_UNDER_SURVEY); -memcpy (&pdev_network->ssid, &pmlmepriv->assoc_ssid,sizeof (struct ndis_802_11_ssid )); +memcpy (&pdev_network->ssid, &pmlmepriv->assoc_ssid, +sizeof (struct ndis_802_11_ssid ));rtw_update_registrypriv_dev_network (adapter);rtw_generate_random_ibss (pibss);
@@ -746,9 +791,13 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)rtw_indicate_connect (adapter); }else {if (rtw_to_roam (adapter) !=0 ) { -if (rtw_dec_to_roam (adapter) ==0 - || _SUCCESS !=rtw_sitesurvey_cmd (adapter, &pmlmepriv->assoc_ssid,1 ,NULL ,0 ) - ) { +if (rtw_dec_to_roam (adapter) ==0 ) { +rtw_set_to_roam (adapter,0 ); +rtw_free_assoc_resources (adapter,1 ); +rtw_indicate_disconnect (adapter); + }else if (rtw_sitesurvey_cmd (adapter, + &pmlmepriv->assoc_ssid, +1 ,NULL ,0 ) != _SUCCESS) {rtw_set_to_roam (adapter,0 );rtw_free_assoc_resources (adapter,1 );rtw_indicate_disconnect (adapter);
@@ -766,8 +815,10 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) &&check_fwstate (pmlmepriv, _FW_LINKED)) {if (rtw_select_roaming_candidate (pmlmepriv) == _SUCCESS) { -receive_disconnect (adapter, pmlmepriv->cur_network.network.mac_address - ,WLAN_REASON_ACTIVE_ROAM ); +u8 *mac_addr = pmlmepriv->cur_network.network.mac_address; + +receive_disconnect (adapter, mac_addr, +WLAN_REASON_ACTIVE_ROAM ); } } }
@@ -951,7 +1002,8 @@ void rtw_scan_abort(struct adapter *adapter) pmlmeext->scan_abort = false; } -static struct sta_info *rtw_joinbss_update_stainfo (struct adapter *padapter,struct wlan_network *pnetwork) +static struct sta_info *rtw_joinbss_update_stainfo (struct adapter *padapter, +struct wlan_network *pnetwork) {int i;struct sta_info *bmc_sta, *psta =NULL ;
@@ -1008,7 +1060,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str }/* for A-MPDU Rx reordering buffer control for bmc_sta & sta_info */ -/* if A-MPDU Rx is enabled, resetting rx_ordering_ctrl wstart_b(indicate_seq) to default value = 0xffff */ +/* if A-MPDU Rx is enabled, resetting rx_ordering_ctrl wstart_b(indicate_seq) +* to default value = 0xffff +*/ /* todo: check if AP can send A-MPDU packets */ for (i =0 ; i <16 ; i++) { preorder_ctrl = &psta->recvreorder_ctrl[i];
@@ -1025,7 +1079,8 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str preorder_ctrl->enable = false; preorder_ctrl->indicate_seq =0xffff ; preorder_ctrl->wend_b =0xffff ; - preorder_ctrl->wsize_b =64 ;/* max_ampdu_sz;ex. 32(kbytes) -> wsize_b =32 */ +/* max_ampdu_sz;ex. 32(kbytes) -> wsize_b =32 */ + preorder_ctrl->wsize_b =64 ; } } }
@@ -1035,10 +1090,12 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str/* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ -static void rtw_joinbss_update_network (struct adapter *padapter,struct wlan_network *ptarget_wlan,struct wlan_network *pnetwork) +static void rtw_joinbss_update_network (struct adapter *padapter,struct wlan_network *ptarget_wlan, +struct wlan_network *pnetwork) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_network *cur_network = &pmlmepriv->cur_network; +u8 signal_strength = ptarget_wlan->network.phy_info.signal_strength;/* why not use ptarget_wlan?? */ memcpy (&cur_network->network, &pnetwork->network, pnetwork->network.length);
@@ -1050,10 +1107,12 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netrtw_set_signal_stat_timer (&padapter->recvpriv); - padapter->recvpriv.signal_strength = ptarget_wlan->network.phy_info.signal_strength; + padapter->recvpriv.signal_strength = signal_strength; padapter->recvpriv.signal_qual = ptarget_wlan->network.phy_info.signal_quality; -/* the ptarget_wlan->network.rssi is raw data, we use ptarget_wlan->network.phy_info.signal_strength instead (has scaled) */ - padapter->recvpriv.rssi =translate_percentage_to_dbm (ptarget_wlan->network.phy_info.signal_strength); +/* the ptarget_wlan->network.rssi is raw data, we use +* ptarget_wlan->network.phy_info.signal_strength instead (has scaled) +*/ + padapter->recvpriv.rssi =translate_percentage_to_dbm (signal_strength);rtw_set_signal_stat_timer (&padapter->recvpriv);
@@ -1078,10 +1137,12 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netif (cur_network->network.ie_length <sizeof (struct ndis_802_11_fix_ie ))return ; -rtw_update_protection (padapter, (cur_network->network.ies) +sizeof (struct ndis_802_11_fix_ie ), - (cur_network->network.ie_length -sizeof (struct ndis_802_11_fix_ie ))); +rtw_update_protection (padapter, + (cur_network->network.ies) +sizeof (struct ndis_802_11_fix_ie ), + (cur_network->network.ie_length -sizeof (struct ndis_802_11_fix_ie ))); -rtw_update_ht_cap (padapter, cur_network->network.ies, cur_network->network.ie_length, (u8 ) cur_network->network.configuration.ds_config); +rtw_update_ht_cap (padapter, cur_network->network.ies, cur_network->network.ie_length, + (u8 )cur_network->network.configuration.ds_config); }static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE ];
@@ -1101,9 +1162,12 @@ void rtw_reset_securitypriv(struct adapter *adapter)/* We have to backup the PMK information for WiFi PMK Caching test item. */ /* */ /* Backup the btkip_countermeasure information. */ -/* When the countermeasure is trigger, the driver have to disconnect with AP for 60 seconds. */ +/* When the countermeasure is trigger, the driver have to +* disconnect with AP for 60 seconds. +*/ -memcpy (&backupPMKIDList[0 ], &adapter->securitypriv.PMKIDList[0 ],sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); +memcpy (&backupPMKIDList[0 ], &adapter->securitypriv.PMKIDList[0 ], +sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); backupPMKIDIndex = adapter->securitypriv.PMKIDIndex; backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure; backupTKIPcountermeasure_time = adapter->securitypriv.btkip_countermeasure_time;
@@ -1114,8 +1178,11 @@ void rtw_reset_securitypriv(struct adapter *adapter)memset ((unsigned char *)&adapter->securitypriv,0 ,sizeof (struct security_priv ));/* Added by Albert 2009/02/18 */ -/* Restore the PMK information to securitypriv structure for the following connection. */ -memcpy (&adapter->securitypriv.PMKIDList[0 ], &backupPMKIDList[0 ],sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); +/* Restore the PMK information to securitypriv structure +* for the following connection. +*/ +memcpy (&adapter->securitypriv.PMKIDList[0 ], &backupPMKIDList[0 ], +sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); adapter->securitypriv.PMKIDIndex = backupPMKIDIndex; adapter->securitypriv.btkip_countermeasure = backupTKIPCountermeasure; adapter->securitypriv.btkip_countermeasure_time = backupTKIPcountermeasure_time;
@@ -1147,9 +1214,13 @@ void rtw_reset_securitypriv(struct adapter *adapter)/* Notes: the function could be > passive_level (the same context as Rx tasklet) */ /* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ -/* if join_res > 0, for (fw_state ==WIFI_STATION_STATE), we check if "ptarget_sta" & "ptarget_wlan" exist. */ +/* if join_res > 0, for (fw_state ==WIFI_STATION_STATE), we check +* if "ptarget_sta" & "ptarget_wlan" exist. +*/ /* if join_res > 0, for (fw_state ==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist. */ -/* if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan != NULL). */ +/* if join_res > 0, update "cur_network->network" from +* "pnetwork->network" if (ptarget_wlan != NULL). +*/ /* */ void rtw_joinbss_event_prehandle (struct adapter *adapter,u8 *pbuf) {
@@ -1161,7 +1232,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)struct wlan_network *pcur_wlan =NULL , *ptarget_wlan =NULL ;unsigned int the_same_macaddr = false; - the_same_macaddr = !memcmp (pnetwork->network.mac_address, cur_network->network.mac_address,ETH_ALEN ); + the_same_macaddr = !memcmp (pnetwork->network.mac_address, + cur_network->network.mac_address,ETH_ALEN ); pnetwork->network.length =get_wlan_bssid_ex_sz (&pnetwork->network);if (pnetwork->network.length >sizeof (struct wlan_bssid_ex ))
@@ -1201,9 +1273,11 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)/* s1. find ptarget_wlan */ if (check_fwstate (pmlmepriv, _FW_LINKED)) {if (the_same_macaddr) { - ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.mac_address); + ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, + cur_network->network.mac_address); }else { - pcur_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.mac_address); + pcur_wlan =rtw_find_network (&pmlmepriv->scanned_queue, + cur_network->network.mac_address);if (pcur_wlan) pcur_wlan->fixed = false;
@@ -1211,7 +1285,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)if (pcur_sta)rtw_free_stainfo (adapter, pcur_sta); - ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, pnetwork->network.mac_address); + ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, + pnetwork->network.mac_address);if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {if (ptarget_wlan) ptarget_wlan->fixed = true;
@@ -1236,7 +1311,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)rtw_joinbss_update_network (adapter, ptarget_wlan, pnetwork); -/* s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode */ +/* s3. find ptarget_sta & update ptarget_sta after +* update cur_network only for station mode +*/ if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) { ptarget_sta =rtw_joinbss_update_stainfo (adapter, pnetwork);if (!ptarget_sta) {
@@ -1304,7 +1381,8 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)/* report to upper layer */ spin_lock_bh (&psta->lock);if (psta->passoc_req && psta->assoc_req_len >0 ) { - passoc_req =kmemdup (psta->passoc_req, psta->assoc_req_len,GFP_ATOMIC ); + passoc_req =kmemdup (psta->passoc_req, + psta->assoc_req_len,GFP_ATOMIC );if (passoc_req) { assoc_req_len = psta->assoc_req_len;
@@ -1329,7 +1407,10 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)if (psta) {/* the sta have been in sta_info_queue => do nothing */ -return ;/* between drv has received this event before and fw have not yet to set key to CAM_ENTRY) */ +/* between drv has received this event before and +* fw have not yet to set key to CAM_ENTRY) +*/ +return ; } psta =rtw_alloc_stainfo (&adapter->stapriv, pstassoc->macaddr);
@@ -1356,7 +1437,8 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {if (adapter->stapriv.asoc_sta_count ==2 ) {spin_lock_bh (&pmlmepriv->scanned_queue.lock); - ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.mac_address); + ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, + cur_network->network.mac_address); pmlmepriv->cur_network_scanned = ptarget_wlan;if (ptarget_wlan) ptarget_wlan->fixed = true;
@@ -1413,16 +1495,19 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)if (adapter->registrypriv.wifi_spec ==1 ) { roam = false; - }else if (reason ==WLAN_REASON_EXPIRATION_CHK &&rtw_chk_roam_flags (adapter,RTW_ROAM_ON_EXPIRED )) { + }else if (reason ==WLAN_REASON_EXPIRATION_CHK && +rtw_chk_roam_flags (adapter,RTW_ROAM_ON_EXPIRED )) { roam = true; - }else if (reason ==WLAN_REASON_ACTIVE_ROAM &&rtw_chk_roam_flags (adapter,RTW_ROAM_ACTIVE )) { + }else if (reason ==WLAN_REASON_ACTIVE_ROAM && +rtw_chk_roam_flags (adapter,RTW_ROAM_ACTIVE )) { roam = true; roam_target = pmlmepriv->roam_network; }if (roam) {if (rtw_to_roam (adapter) >0 ) -rtw_dec_to_roam (adapter);/* this stadel_event is caused by roaming, decrease to_roam */ +/* this stadel_event is caused by roaming, decrease to_roam */ +rtw_dec_to_roam (adapter);else if (rtw_to_roam (adapter) ==0 )rtw_set_to_roam (adapter, adapter->registrypriv.max_roaming_times); }else {
@@ -1436,7 +1521,8 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)spin_lock_bh (&pmlmepriv->scanned_queue.lock);/* remove the network entry in scanned_queue */ - pwlan =rtw_find_network (&pmlmepriv->scanned_queue, tgt_network->network.mac_address); + pwlan =rtw_find_network (&pmlmepriv->scanned_queue, + tgt_network->network.mac_address);if (pwlan) { pwlan->fixed = false;rtw_free_network_nolock (adapter, pwlan);
@@ -1450,12 +1536,14 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {rtw_free_stainfo (adapter, psta); -if (adapter->stapriv.asoc_sta_count ==1 ) {/* a sta + bc/mc_stainfo (not Ibss_stainfo) */ +/* a sta + bc/mc_stainfo (not Ibss_stainfo) */ +if (adapter->stapriv.asoc_sta_count ==1 ) {u8 ret = _SUCCESS;spin_lock_bh (&pmlmepriv->scanned_queue.lock);/* free old ibss network */ - pwlan =rtw_find_network (&pmlmepriv->scanned_queue, tgt_network->network.mac_address); + pwlan =rtw_find_network (&pmlmepriv->scanned_queue, + tgt_network->network.mac_address);if (pwlan) { pwlan->fixed = false;rtw_free_network_nolock (adapter, pwlan);
@@ -1465,9 +1553,11 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) pdev_network = &adapter->registrypriv.dev_network; pibss = adapter->registrypriv.dev_network.mac_address; -memcpy (pdev_network, &tgt_network->network,get_wlan_bssid_ex_sz (&tgt_network->network)); +memcpy (pdev_network, &tgt_network->network, +get_wlan_bssid_ex_sz (&tgt_network->network)); -memcpy (&pdev_network->ssid, &pmlmepriv->assoc_ssid,sizeof (struct ndis_802_11_ssid )); +memcpy (&pdev_network->ssid, &pmlmepriv->assoc_ssid, +sizeof (struct ndis_802_11_ssid ));rtw_update_registrypriv_dev_network (adapter);
@@ -1538,7 +1628,9 @@ void _rtw_join_timeout_handler(struct timer_list *t)rtw_indicate_disconnect (adapter);free_scanqueue (pmlmepriv);/* */ -/* indicate disconnect for the case that join_timeout and check_fwstate != FW_LINKED */ +/* indicate disconnect for the case that join_timeout +* and check_fwstate != FW_LINKED +*/ rtw_cfg80211_indicate_disconnect (adapter); }
@@ -1584,11 +1676,13 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *adapter)static void rtw_auto_scan_handler (struct adapter *padapter) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +unsigned int elapsed_ms;rtw_mlme_reset_auto_scan_int (padapter); -if (pmlmepriv->auto_scan_int_ms !=0 - &&jiffies_to_msecs (jiffies - pmlmepriv->scan_start_time) > pmlmepriv->auto_scan_int_ms) { + elapsed_ms =jiffies_to_msecs (jiffies - pmlmepriv->scan_start_time); + +if (pmlmepriv->auto_scan_int_ms !=0 && elapsed_ms > pmlmepriv->auto_scan_int_ms) {if (!padapter->registrypriv.wifi_spec) {if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) goto exit;
@@ -1630,7 +1724,9 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)/* rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_ENTER, 1); */ rtw_hal_dm_watchdog_in_lps (adapter); }else { -/* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) in traffic_status_watchdog() */ +/* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) +* in traffic_status_watchdog() +*/ } }else {
@@ -1673,6 +1769,7 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlme {int updated = false; struct adapter *adapter = container_of(mlme, struct adapter, mlmepriv); +long rssi_diff;if (is_same_ess (&competitor->network, &mlme->cur_network.network) == false) goto exit;
@@ -1690,7 +1787,8 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlmeif (jiffies_to_msecs (jiffies - competitor->last_scanned) >= mlme->roam_scanr_exp_ms) goto exit; -if (competitor->network.rssi - mlme->cur_network_scanned->network.rssi < mlme->roam_rssi_diff_th) + rssi_diff = competitor->network.rssi - mlme->cur_network_scanned->network.rssi; +if (rssi_diff < mlme->roam_rssi_diff_th) goto exit;if (*candidate && (*candidate)->network.rssi >= competitor->network.rssi)
@@ -1763,9 +1861,12 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme/* check ssid, if needed */ if (mlme->assoc_ssid.ssid[0 ] && mlme->assoc_ssid.ssid_length) { -if (competitor->network.ssid.ssid_length != mlme->assoc_ssid.ssid_length - ||memcmp (competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, mlme->assoc_ssid.ssid_length) - ) +u8 *ssid_comp = competitor->network.ssid.ssid; +u8 *ssid_mlme = mlme->assoc_ssid.ssid; +u32 len_comp = competitor->network.ssid.ssid_length; +u32 len_mlme = mlme->assoc_ssid.ssid_length; + +if (len_comp != len_mlme ||memcmp (ssid_comp, ssid_mlme, len_mlme)) goto exit; }
@@ -1882,7 +1983,8 @@ signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecurityreturn res; } -signed int rtw_set_key (struct adapter *adapter,struct security_priv *psecuritypriv,signed int keyid,u8 set_tx,bool enqueue) +signed int rtw_set_key (struct adapter *adapter,struct security_priv *psecuritypriv, +signed int keyid,u8 set_tx,bool enqueue) {u8 keylen;struct cmd_obj *pcmd;
@@ -1957,7 +2059,8 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp }/* adjust ies for rtw_joinbss_cmd in WMM */ -int rtw_restruct_wmm_ie (struct adapter *adapter,u8 *in_ie,u8 *out_ie,uint in_len,uint initial_out_len) +int rtw_restruct_wmm_ie (struct adapter *adapter,u8 *in_ie,u8 *out_ie, +uint in_len,uint initial_out_len) {unsigned int ielength =0 ;unsigned int i, j;
@@ -2061,7 +2164,8 @@ static void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie) wrqu.data.length = p - buff; - wrqu.data.length = (wrqu.data.length <IW_CUSTOM_MAX ) ? wrqu.data.length :IW_CUSTOM_MAX ; + wrqu.data.length =min_t (typeof (wrqu.data.length), + wrqu.data.length,IW_CUSTOM_MAX );kfree (buff); }
@@ -2091,7 +2195,8 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u ielength += psecuritypriv->wps_ie_len; }else if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) || (authmode ==WLAN_EID_RSN )) {/* copy RSN or SSN */ -memcpy (&out_ie[ielength], &psecuritypriv->supplicant_ie[0 ], psecuritypriv->supplicant_ie[1 ] +2 ); +memcpy (&out_ie[ielength], &psecuritypriv->supplicant_ie[0 ], + psecuritypriv->supplicant_ie[1 ] +2 ); ielength += psecuritypriv->supplicant_ie[1 ] +2 ;rtw_report_sec_ie (adapter, authmode, psecuritypriv->supplicant_ie); }
@@ -2129,7 +2234,8 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)struct security_priv *psecuritypriv = &adapter->securitypriv;struct wlan_network *cur_network = &adapter->mlmepriv.cur_network; - pdev_network->privacy = (psecuritypriv->dot11PrivacyAlgrthm >0 ?1 :0 ) ;/* adhoc no 802.1x */ +/* adhoc no 802.1x */ + pdev_network->privacy = (psecuritypriv->dot11PrivacyAlgrthm >0 ?1 :0 ); pdev_network->rssi =0 ;
@@ -2159,14 +2265,18 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)/* 1. Supported rates */ /* 2. IE */ -/* rtw_set_supported_rate(pdev_network->supported_rates, pregistrypriv->wireless_mode) ; will be called in rtw_generate_ie */ +/* rtw_set_supported_rate(pdev_network->supported_rates, +* pregistrypriv->wireless_mode); will be called in rtw_generate_ie +*/ sz =rtw_generate_ie (pregistrypriv); pdev_network->ie_length = sz; pdev_network->length =get_wlan_bssid_ex_sz ((struct wlan_bssid_ex *)pdev_network); -/* notes: translate ie_length & length after assign the length to cmdsz in createbss_cmd(); */ +/* notes: translate ie_length & length after assign the +* length to cmdsz in createbss_cmd(); +*/ /* pdev_network->ie_length = cpu_to_le32(sz); */ }
@@ -2178,7 +2288,9 @@ void rtw_joinbss_reset(struct adapter *padapter)struct ht_priv *phtpriv = &pmlmepriv->htpriv; -/* todo: if you want to do something io/reg/hw setting before join_bss, please add code here */ +/* todo: if you want to do something io/reg/hw setting before join_bss, +* please add code here +*/ pmlmepriv->num_FortyMHzIntolerant =0 ;
@@ -2268,7 +2380,8 @@ void rtw_build_wmm_ie_ht(struct adapter *padapter, u8 *out_ie, uint *pout_len) }/* the function is >= passive_level */ -unsigned int rtw_restructure_ht_ie (struct adapter *padapter,u8 *in_ie,u8 *out_ie,uint in_len,uint *pout_len,u8 channel) +unsigned int rtw_restructure_ht_ie (struct adapter *padapter,u8 *in_ie,u8 *out_ie, +uint in_len,uint *pout_len,u8 channel) {u32 ielen, out_len;enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor;
@@ -2349,7 +2462,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_/* update default supported_mcs_set */ if (stbc_rx_enable) - ht_capie.cap_info |=cpu_to_le16 (IEEE80211_HT_CAP_RX_STBC_1R );/* RX STBC One spatial stream */ +/* RX STBC One spatial stream */ + ht_capie.cap_info |=cpu_to_le16 (IEEE80211_HT_CAP_RX_STBC_1R );set_mcs_rate_by_mask (ht_capie.mcs.rx_mask,MCS_RATE_1R );
@@ -2415,7 +2529,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe/* check Max Rx A-MPDU Size */ len =0 ; - p =rtw_get_ie (pie +sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_CAPABILITY , &len, ie_len -sizeof (struct ndis_802_11_fix_ie )); + p =rtw_get_ie (pie +sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_CAPABILITY , + &len, ie_len -sizeof (struct ndis_802_11_fix_ie ));if (p && len >0 ) { pht_capie = (struct ieee80211_ht_cap *)(p +2 ); max_ampdu_sz = (pht_capie->ampdu_params_info &IEEE80211_HT_CAP_AMPDU_FACTOR );
@@ -2425,7 +2540,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe } len =0 ; - p =rtw_get_ie (pie +sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_OPERATION , &len, ie_len -sizeof (struct ndis_802_11_fix_ie )); + p =rtw_get_ie (pie +sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_OPERATION , + &len, ie_len -sizeof (struct ndis_802_11_fix_ie ));if (p && len >0 ) {/* todo: */ }
@@ -2438,13 +2554,14 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & BIT(1)) && (pmlmeinfo->HT_info.infos[0] & BIT(2))) {int i; +u8 *mcs_rate = pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate;/* update the MCS set */ for (i =0 ; i <16 ; i++) - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= pmlmeext->default_supported_mcs_set[i]; + mcs_rate[i] &= pmlmeext->default_supported_mcs_set[i];/* update the MCS rates */ -set_mcs_rate_by_mask (pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate,MCS_RATE_1R ); +set_mcs_rate_by_mask (mcs_rate,MCS_RATE_1R );/* switch to the 40M Hz mode according to the AP */ /* pmlmeext->cur_bwmode = CHANNEL_WIDTH_40; */
@@ -2558,7 +2675,8 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)struct wlan_network *cur_network = &pmlmepriv->cur_network;if (rtw_to_roam (padapter) >0 ) { -memcpy (&pmlmepriv->assoc_ssid, &cur_network->network.ssid,sizeof (struct ndis_802_11_ssid )); +memcpy (&pmlmepriv->assoc_ssid, &cur_network->network.ssid, +sizeof (struct ndis_802_11_ssid )); pmlmepriv->assoc_by_bssid = false;
Signature · 1 line
2.54.0
Re: [PATCH v3 2/5] staging: rtl8723bs: rtw_mlme: fix lines exceeding 100 columns
Quoted 35 lines · Salman Alghamdi
Wrap long lines and extract local variables to bring all lines within the 100 column limit.
Signed-off-by Salman Alghamdi <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 284 +++++++++++++++------- 1 file changed, 201 insertions(+), 83 deletions(-)drivers/staging/rtl8723bs/core/rtw_mlme.c +6
-2@@ -52,7 +52,10 @@ int rtw_init_mlme_priv(struct adapter *padapter) pmlmepriv->pscanned =NULL ; pmlmepriv->fw_state =WIFI_STATION_STATE ;/* Must sync with rtw_wdev_alloc() */ pmlmepriv->cur_network.network.infrastructure_mode = Ndis802_11AutoUnknown; - pmlmepriv->scan_mode =SCAN_ACTIVE ;/* 1: active, 0: passive. Maybe someday we should rename this varable to "active_mode" (Jeff) */ +/* 1: active, 0: passive. Maybe someday we should rename +* this varable to "active_mode" (Jeff) +*/ + pmlmepriv->scan_mode =SCAN_ACTIVE ;spin_lock_init (&pmlmepriv->lock);INIT_LIST_HEAD (&pmlmepriv->free_bss_pool.queue);@@ -125,7 +128,8 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)rtw_free_mlme_ie_data (&pmlmepriv->p2p_beacon_ie, &pmlmepriv->p2p_beacon_ie_len);rtw_free_mlme_ie_data (&pmlmepriv->p2p_probe_req_ie, &pmlmepriv->p2p_probe_req_ie_len);rtw_free_mlme_ie_data (&pmlmepriv->p2p_probe_resp_ie, &pmlmepriv->p2p_probe_resp_ie_len); -rtw_free_mlme_ie_data (&pmlmepriv->p2p_go_probe_resp_ie, &pmlmepriv->p2p_go_probe_resp_ie_len); +rtw_free_mlme_ie_data (&pmlmepriv->p2p_go_probe_resp_ie, + &pmlmepriv->p2p_go_probe_resp_ie_len);rtw_free_mlme_ie_data (&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc_req_ie_len); }
drivers/staging/rtl8723bs/core/rtw_mlme.c int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea · line 377
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +2
-1@@ -369,7 +373,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea (d_cap & WLAN_CAPABILITY_ESS)); } -struct wlan_network *_rtw_find_same_network (struct __queue *scanned_queue,struct wlan_network *network) +struct wlan_network *_rtw_find_same_network (struct __queue *scanned_queue, +struct wlan_network *network)
^^^^^
This is not aligned correctly again. Please align it as following:
struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue,
struct wlan_network *network)
Quoted 183 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +71
-25{struct list_head *phead, *plist;struct wlan_network *found =NULL ;@@ -420,7 +425,8 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,long rssi_final;/* The rule below is 1/5 for sample value, 4/5 for history value */ -if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) &&is_same_network (&padapter->mlmepriv.cur_network.network, src,0 )) { +if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) && +is_same_network (&padapter->mlmepriv.cur_network.network, src,0 )) {/* Take the recvpriv's value for the connected AP*/ ss_final = padapter->recvpriv.signal_strength; sq_final = padapter->recvpriv.signal_qual;@@ -431,11 +437,15 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, rssi_final = rssi_ori; }else {if (sq_smp !=101 ) {/* from the right channel */ - ss_final = ((u32)(src->phy_info.signal_strength) + (u32)(dst->phy_info.signal_strength) *4 ) /5 ; - sq_final = ((u32)(src->phy_info.signal_quality) + (u32)(dst->phy_info.signal_quality) *4 ) /5 ; + ss_final = ((u32)(src->phy_info.signal_strength) + + (u32)(dst->phy_info.signal_strength) *4 ) /5 ; + sq_final = ((u32)(src->phy_info.signal_quality) + + (u32)(dst->phy_info.signal_quality) *4 ) /5 ; rssi_final = (src->rssi + dst->rssi *4 ) /5 ; }else { -/* bss info not receiving from the right channel, use the original RX signal infos */ +/* bss info not receiving from the right channel, use +* the original RX signal infos +*/ ss_final = dst->phy_info.signal_strength; sq_final = dst->phy_info.signal_quality; rssi_final = dst->rssi;@@ -462,13 +472,18 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex &pmlmepriv->cur_network.network, &pmlmepriv->cur_network.network); -if (check_fwstate (pmlmepriv, _FW_LINKED) && (is_same_network (&pmlmepriv->cur_network.network, pnetwork,0 ))) { +if (check_fwstate (pmlmepriv, _FW_LINKED) && + (is_same_network (&pmlmepriv->cur_network.network, pnetwork,0 ))) { +u32 ie_len; +u8 *ie; +update_network (&pmlmepriv->cur_network.network, pnetwork, adapter, true); -if (pmlmepriv->cur_network.network.ie_length <sizeof (struct ndis_802_11_fix_ie )) + ie_len = pmlmepriv->cur_network.network.ie_length; +if (ie_len <sizeof (struct ndis_802_11_fix_ie ))return ; -rtw_update_protection (adapter, (pmlmepriv->cur_network.network.ies) +sizeof (struct ndis_802_11_fix_ie ), - pmlmepriv->cur_network.network.ie_length -sizeof (struct ndis_802_11_fix_ie )); + ie = pmlmepriv->cur_network.network.ies +sizeof (struct ndis_802_11_fix_ie ); +rtw_update_protection (adapter, ie, ie_len -sizeof (struct ndis_802_11_fix_ie )); } }@@ -604,7 +619,16 @@ static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network privacy = pnetwork->network.privacy;if (check_fwstate (pmlmepriv,WIFI_UNDER_WPS )) { -if (rtw_get_wps_ie (pnetwork->network.ies + _FIXED_IE_LENGTH_, pnetwork->network.ie_length - _FIXED_IE_LENGTH_,NULL , &wps_ielen)) +u8 *ie_ptr; +u32 ie_len_val; + +if (pnetwork->network.ie_length < _FIXED_IE_LENGTH_) +return false; + + ie_ptr = pnetwork->network.ies + _FIXED_IE_LENGTH_; + ie_len_val = pnetwork->network.ie_length - _FIXED_IE_LENGTH_; + +if (rtw_get_wps_ie (ie_ptr, ie_len_val,NULL , &wps_ielen))return true;else return false;@@ -617,11 +641,20 @@ static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network bselected = false;if (psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPA2PSK) { - p =rtw_get_ie (pnetwork->network.ies + _BEACON_IE_OFFSET_,WLAN_EID_RSN , &ie_len, (pnetwork->network.ie_length - _BEACON_IE_OFFSET_)); -if (p && ie_len >0 ) - bselected = true; -else +u8 *ie_ptr; +u32 ie_len_val; + +if (pnetwork->network.ie_length < _BEACON_IE_OFFSET_) { bselected = false; + }else { + ie_ptr = pnetwork->network.ies + _BEACON_IE_OFFSET_; + ie_len_val = pnetwork->network.ie_length - _BEACON_IE_OFFSET_; + p =rtw_get_ie (ie_ptr,WLAN_EID_RSN , &ie_len, ie_len_val); +if (p && ie_len >0 ) + bselected = true; +else + bselected = false; + } } }@@ -629,7 +662,13 @@ static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network bselected = false;if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) { -if (pnetwork->network.infrastructure_mode != pmlmepriv->cur_network.network.infrastructure_mode) +enum ndis_802_11_network_infrastructure inf_mode; +enum ndis_802_11_network_infrastructure cur_inf; + + inf_mode = pnetwork->network.infrastructure_mode; + cur_inf = pmlmepriv->cur_network.network.infrastructure_mode; + +if (inf_mode != cur_inf) bselected = false; }@@ -657,12 +696,14 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)/* update IBSS_network 's timestamp */ if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) { -if (!memcmp (&pmlmepriv->cur_network.network.mac_address, pnetwork->mac_address,ETH_ALEN )) { +if (!memcmp (&pmlmepriv->cur_network.network.mac_address, + pnetwork->mac_address,ETH_ALEN )) {struct wlan_network *ibss_wlan =NULL ;memcpy (pmlmepriv->cur_network.network.ies, pnetwork->ies,8 );spin_lock_bh (&pmlmepriv->scanned_queue.lock); - ibss_wlan =rtw_find_network (&pmlmepriv->scanned_queue, pnetwork->mac_address); + ibss_wlan =rtw_find_network (&pmlmepriv->scanned_queue, + pnetwork->mac_address);if (ibss_wlan) {memcpy (ibss_wlan->network.ies, pnetwork->ies,8 );spin_unlock_bh (&pmlmepriv->scanned_queue.lock);@@ -713,13 +754,17 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)_set_timer (&pmlmepriv->assoc_timer,MAX_JOIN_TIMEOUT ); }else {u8 ret = _SUCCESS; -struct wlan_bssid_ex *pdev_network = &adapter->registrypriv.dev_network; -u8 *pibss = adapter->registrypriv.dev_network.mac_address; +struct registry_priv *regs = &adapter->registrypriv; +struct wlan_bssid_ex *pdev_network = ®s->dev_network; +u8 *pibss = regs->dev_network.mac_address; -/* pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;because don't set assoc_timer */ +/* pmlmepriv->fw_state ^= _FW_UNDER_SURVEY; +* because don't set assoc_timer +*/ _clr_fwstate_ (pmlmepriv, _FW_UNDER_SURVEY); -memcpy (&pdev_network->ssid, &pmlmepriv->assoc_ssid,sizeof (struct ndis_802_11_ssid )); +memcpy (&pdev_network->ssid, &pmlmepriv->assoc_ssid, +sizeof (struct ndis_802_11_ssid ));rtw_update_registrypriv_dev_network (adapter);rtw_generate_random_ibss (pibss);@@ -746,9 +791,13 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)rtw_indicate_connect (adapter); }else {if (rtw_to_roam (adapter) !=0 ) { -if (rtw_dec_to_roam (adapter) ==0 - || _SUCCESS !=rtw_sitesurvey_cmd (adapter, &pmlmepriv->assoc_ssid,1 ,NULL ,0 ) - ) { +if (rtw_dec_to_roam (adapter) ==0 ) { +rtw_set_to_roam (adapter,0 ); +rtw_free_assoc_resources (adapter,1 ); +rtw_indicate_disconnect (adapter); + }else if (rtw_sitesurvey_cmd (adapter, + &pmlmepriv->assoc_ssid, +1 ,NULL ,0 ) != _SUCCESS) {rtw_set_to_roam (adapter,0 );rtw_free_assoc_resources (adapter,1 );rtw_indicate_disconnect (adapter);@@ -766,8 +815,10 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) &&check_fwstate (pmlmepriv, _FW_LINKED)) {if (rtw_select_roaming_candidate (pmlmepriv) == _SUCCESS) { -receive_disconnect (adapter, pmlmepriv->cur_network.network.mac_address - ,WLAN_REASON_ACTIVE_ROAM ); +u8 *mac_addr = pmlmepriv->cur_network.network.mac_address; + +receive_disconnect (adapter, mac_addr, +WLAN_REASON_ACTIVE_ROAM ); } } }
drivers/staging/rtl8723bs/core/rtw_mlme.c void rtw_scan_abort(struct adapter *adapter) · line 1006
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +2
-1@@ -951,7 +1002,8 @@ void rtw_scan_abort(struct adapter *adapter) pmlmeext->scan_abort = false; } -static struct sta_info *rtw_joinbss_update_stainfo (struct adapter *padapter,struct wlan_network *pnetwork) +static struct sta_info *rtw_joinbss_update_stainfo (struct adapter *padapter, +struct wlan_network *pnetwork)
^^^^^
Again, wrong alignment.
Quoted 25 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +5
-2{int i;struct sta_info *bmc_sta, *psta =NULL ;@@ -1008,7 +1060,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str }/* for A-MPDU Rx reordering buffer control for bmc_sta & sta_info */ -/* if A-MPDU Rx is enabled, resetting rx_ordering_ctrl wstart_b(indicate_seq) to default value = 0xffff */ +/* if A-MPDU Rx is enabled, resetting rx_ordering_ctrl wstart_b(indicate_seq) +* to default value = 0xffff +*/ /* todo: check if AP can send A-MPDU packets */ for (i =0 ; i <16 ; i++) { preorder_ctrl = &psta->recvreorder_ctrl[i];@@ -1025,7 +1079,8 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str preorder_ctrl->enable = false; preorder_ctrl->indicate_seq =0xffff ; preorder_ctrl->wend_b =0xffff ; - preorder_ctrl->wsize_b =64 ;/* max_ampdu_sz;ex. 32(kbytes) -> wsize_b =32 */ +/* max_ampdu_sz;ex. 32(kbytes) -> wsize_b =32 */ + preorder_ctrl->wsize_b =64 ; } } }
drivers/staging/rtl8723bs/core/rtw_mlme.c static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str · line 1094
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +2
-1@@ -1035,10 +1090,12 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str/* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ -static void rtw_joinbss_update_network (struct adapter *padapter,struct wlan_network *ptarget_wlan,struct wlan_network *pnetwork) +static void rtw_joinbss_update_network (struct adapter *padapter,struct wlan_network *ptarget_wlan, +struct wlan_network *pnetwork)
Same here, wrong alignment.
Quoted 55 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +16
-8{struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_network *cur_network = &pmlmepriv->cur_network; +u8 signal_strength = ptarget_wlan->network.phy_info.signal_strength;/* why not use ptarget_wlan?? */ memcpy (&cur_network->network, &pnetwork->network, pnetwork->network.length);@@ -1050,10 +1107,12 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netrtw_set_signal_stat_timer (&padapter->recvpriv); - padapter->recvpriv.signal_strength = ptarget_wlan->network.phy_info.signal_strength; + padapter->recvpriv.signal_strength = signal_strength; padapter->recvpriv.signal_qual = ptarget_wlan->network.phy_info.signal_quality; -/* the ptarget_wlan->network.rssi is raw data, we use ptarget_wlan->network.phy_info.signal_strength instead (has scaled) */ - padapter->recvpriv.rssi =translate_percentage_to_dbm (ptarget_wlan->network.phy_info.signal_strength); +/* the ptarget_wlan->network.rssi is raw data, we use +* ptarget_wlan->network.phy_info.signal_strength instead (has scaled) +*/ + padapter->recvpriv.rssi =translate_percentage_to_dbm (signal_strength);rtw_set_signal_stat_timer (&padapter->recvpriv);@@ -1078,10 +1137,12 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netif (cur_network->network.ie_length <sizeof (struct ndis_802_11_fix_ie ))return ; -rtw_update_protection (padapter, (cur_network->network.ies) +sizeof (struct ndis_802_11_fix_ie ), - (cur_network->network.ie_length -sizeof (struct ndis_802_11_fix_ie ))); +rtw_update_protection (padapter, + (cur_network->network.ies) +sizeof (struct ndis_802_11_fix_ie ), + (cur_network->network.ie_length -sizeof (struct ndis_802_11_fix_ie ))); -rtw_update_ht_cap (padapter, cur_network->network.ies, cur_network->network.ie_length, (u8 ) cur_network->network.configuration.ds_config); +rtw_update_ht_cap (padapter, cur_network->network.ies, cur_network->network.ie_length, + (u8 )cur_network->network.configuration.ds_config); }static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE ];@@ -1101,9 +1162,12 @@ void rtw_reset_securitypriv(struct adapter *adapter)/* We have to backup the PMK information for WiFi PMK Caching test item. */ /* */ /* Backup the btkip_countermeasure information. */ -/* When the countermeasure is trigger, the driver have to disconnect with AP for 60 seconds. */ +/* When the countermeasure is trigger, the driver have to +* disconnect with AP for 60 seconds. +*/ -memcpy (&backupPMKIDList[0 ], &adapter->securitypriv.PMKIDList[0 ],sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); +memcpy (&backupPMKIDList[0 ], &adapter->securitypriv.PMKIDList[0 ], +sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); backupPMKIDIndex = adapter->securitypriv.PMKIDIndex; backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure; backupTKIPcountermeasure_time = adapter->securitypriv.btkip_countermeasure_time;
drivers/staging/rtl8723bs/core/rtw_mlme.c void rtw_reset_securitypriv(struct adapter *adapter) · line 1183
Quoted 8 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +3
-2@@ -1114,8 +1178,11 @@ void rtw_reset_securitypriv(struct adapter *adapter)memset ((unsigned char *)&adapter->securitypriv,0 ,sizeof (struct security_priv ));/* Added by Albert 2009/02/18 */ -/* Restore the PMK information to securitypriv structure for the following connection. */ -memcpy (&adapter->securitypriv.PMKIDList[0 ], &backupPMKIDList[0 ],sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); +/* Restore the PMK information to securitypriv structure +* for the following connection. +*/
This is not aligned correctly either. f from from should go under R from Restore:
/* Restore the PMK information to securitypriv structure
* for the following connection.
*/
Quoted 235 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +62
-26+memcpy (&adapter->securitypriv.PMKIDList[0 ], &backupPMKIDList[0 ], +sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); adapter->securitypriv.PMKIDIndex = backupPMKIDIndex; adapter->securitypriv.btkip_countermeasure = backupTKIPCountermeasure; adapter->securitypriv.btkip_countermeasure_time = backupTKIPcountermeasure_time;@@ -1147,9 +1214,13 @@ void rtw_reset_securitypriv(struct adapter *adapter)/* Notes: the function could be > passive_level (the same context as Rx tasklet) */ /* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ -/* if join_res > 0, for (fw_state ==WIFI_STATION_STATE), we check if "ptarget_sta" & "ptarget_wlan" exist. */ +/* if join_res > 0, for (fw_state ==WIFI_STATION_STATE), we check +* if "ptarget_sta" & "ptarget_wlan" exist. +*/ /* if join_res > 0, for (fw_state ==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist. */ -/* if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan != NULL). */ +/* if join_res > 0, update "cur_network->network" from +* "pnetwork->network" if (ptarget_wlan != NULL). +*/ /* */ void rtw_joinbss_event_prehandle (struct adapter *adapter,u8 *pbuf) {@@ -1161,7 +1232,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)struct wlan_network *pcur_wlan =NULL , *ptarget_wlan =NULL ;unsigned int the_same_macaddr = false; - the_same_macaddr = !memcmp (pnetwork->network.mac_address, cur_network->network.mac_address,ETH_ALEN ); + the_same_macaddr = !memcmp (pnetwork->network.mac_address, + cur_network->network.mac_address,ETH_ALEN ); pnetwork->network.length =get_wlan_bssid_ex_sz (&pnetwork->network);if (pnetwork->network.length >sizeof (struct wlan_bssid_ex ))@@ -1201,9 +1273,11 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)/* s1. find ptarget_wlan */ if (check_fwstate (pmlmepriv, _FW_LINKED)) {if (the_same_macaddr) { - ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.mac_address); + ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, + cur_network->network.mac_address); }else { - pcur_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.mac_address); + pcur_wlan =rtw_find_network (&pmlmepriv->scanned_queue, + cur_network->network.mac_address);if (pcur_wlan) pcur_wlan->fixed = false;@@ -1211,7 +1285,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)if (pcur_sta)rtw_free_stainfo (adapter, pcur_sta); - ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, pnetwork->network.mac_address); + ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, + pnetwork->network.mac_address);if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {if (ptarget_wlan) ptarget_wlan->fixed = true;@@ -1236,7 +1311,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)rtw_joinbss_update_network (adapter, ptarget_wlan, pnetwork); -/* s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode */ +/* s3. find ptarget_sta & update ptarget_sta after +* update cur_network only for station mode +*/ if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) { ptarget_sta =rtw_joinbss_update_stainfo (adapter, pnetwork);if (!ptarget_sta) {@@ -1304,7 +1381,8 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)/* report to upper layer */ spin_lock_bh (&psta->lock);if (psta->passoc_req && psta->assoc_req_len >0 ) { - passoc_req =kmemdup (psta->passoc_req, psta->assoc_req_len,GFP_ATOMIC ); + passoc_req =kmemdup (psta->passoc_req, + psta->assoc_req_len,GFP_ATOMIC );if (passoc_req) { assoc_req_len = psta->assoc_req_len;@@ -1329,7 +1407,10 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)if (psta) {/* the sta have been in sta_info_queue => do nothing */ -return ;/* between drv has received this event before and fw have not yet to set key to CAM_ENTRY) */ +/* between drv has received this event before and +* fw have not yet to set key to CAM_ENTRY) +*/ +return ; } psta =rtw_alloc_stainfo (&adapter->stapriv, pstassoc->macaddr);@@ -1356,7 +1437,8 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {if (adapter->stapriv.asoc_sta_count ==2 ) {spin_lock_bh (&pmlmepriv->scanned_queue.lock); - ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.mac_address); + ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, + cur_network->network.mac_address); pmlmepriv->cur_network_scanned = ptarget_wlan;if (ptarget_wlan) ptarget_wlan->fixed = true;@@ -1413,16 +1495,19 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)if (adapter->registrypriv.wifi_spec ==1 ) { roam = false; - }else if (reason ==WLAN_REASON_EXPIRATION_CHK &&rtw_chk_roam_flags (adapter,RTW_ROAM_ON_EXPIRED )) { + }else if (reason ==WLAN_REASON_EXPIRATION_CHK && +rtw_chk_roam_flags (adapter,RTW_ROAM_ON_EXPIRED )) { roam = true; - }else if (reason ==WLAN_REASON_ACTIVE_ROAM &&rtw_chk_roam_flags (adapter,RTW_ROAM_ACTIVE )) { + }else if (reason ==WLAN_REASON_ACTIVE_ROAM && +rtw_chk_roam_flags (adapter,RTW_ROAM_ACTIVE )) { roam = true; roam_target = pmlmepriv->roam_network; }if (roam) {if (rtw_to_roam (adapter) >0 ) -rtw_dec_to_roam (adapter);/* this stadel_event is caused by roaming, decrease to_roam */ +/* this stadel_event is caused by roaming, decrease to_roam */ +rtw_dec_to_roam (adapter);else if (rtw_to_roam (adapter) ==0 )rtw_set_to_roam (adapter, adapter->registrypriv.max_roaming_times); }else {@@ -1436,7 +1521,8 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)spin_lock_bh (&pmlmepriv->scanned_queue.lock);/* remove the network entry in scanned_queue */ - pwlan =rtw_find_network (&pmlmepriv->scanned_queue, tgt_network->network.mac_address); + pwlan =rtw_find_network (&pmlmepriv->scanned_queue, + tgt_network->network.mac_address);if (pwlan) { pwlan->fixed = false;rtw_free_network_nolock (adapter, pwlan);@@ -1450,12 +1536,14 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {rtw_free_stainfo (adapter, psta); -if (adapter->stapriv.asoc_sta_count ==1 ) {/* a sta + bc/mc_stainfo (not Ibss_stainfo) */ +/* a sta + bc/mc_stainfo (not Ibss_stainfo) */ +if (adapter->stapriv.asoc_sta_count ==1 ) {u8 ret = _SUCCESS;spin_lock_bh (&pmlmepriv->scanned_queue.lock);/* free old ibss network */ - pwlan =rtw_find_network (&pmlmepriv->scanned_queue, tgt_network->network.mac_address); + pwlan =rtw_find_network (&pmlmepriv->scanned_queue, + tgt_network->network.mac_address);if (pwlan) { pwlan->fixed = false;rtw_free_network_nolock (adapter, pwlan);@@ -1465,9 +1553,11 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) pdev_network = &adapter->registrypriv.dev_network; pibss = adapter->registrypriv.dev_network.mac_address; -memcpy (pdev_network, &tgt_network->network,get_wlan_bssid_ex_sz (&tgt_network->network)); +memcpy (pdev_network, &tgt_network->network, +get_wlan_bssid_ex_sz (&tgt_network->network)); -memcpy (&pdev_network->ssid, &pmlmepriv->assoc_ssid,sizeof (struct ndis_802_11_ssid )); +memcpy (&pdev_network->ssid, &pmlmepriv->assoc_ssid, +sizeof (struct ndis_802_11_ssid ));rtw_update_registrypriv_dev_network (adapter);@@ -1538,7 +1628,9 @@ void _rtw_join_timeout_handler(struct timer_list *t)rtw_indicate_disconnect (adapter);free_scanqueue (pmlmepriv);/* */ -/* indicate disconnect for the case that join_timeout and check_fwstate != FW_LINKED */ +/* indicate disconnect for the case that join_timeout +* and check_fwstate != FW_LINKED +*/ rtw_cfg80211_indicate_disconnect (adapter); }@@ -1584,11 +1676,13 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *adapter)static void rtw_auto_scan_handler (struct adapter *padapter) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +unsigned int elapsed_ms;rtw_mlme_reset_auto_scan_int (padapter); -if (pmlmepriv->auto_scan_int_ms !=0 - &&jiffies_to_msecs (jiffies - pmlmepriv->scan_start_time) > pmlmepriv->auto_scan_int_ms) { + elapsed_ms =jiffies_to_msecs (jiffies - pmlmepriv->scan_start_time); + +if (pmlmepriv->auto_scan_int_ms !=0 && elapsed_ms > pmlmepriv->auto_scan_int_ms) {if (!padapter->registrypriv.wifi_spec) {if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) goto exit;@@ -1630,7 +1724,9 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)/* rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_ENTER, 1); */ rtw_hal_dm_watchdog_in_lps (adapter); }else { -/* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) in traffic_status_watchdog() */ +/* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) +* in traffic_status_watchdog() +*/ } }else {@@ -1673,6 +1769,7 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlme {int updated = false; struct adapter *adapter = container_of(mlme, struct adapter, mlmepriv); +long rssi_diff;if (is_same_ess (&competitor->network, &mlme->cur_network.network) == false) goto exit;@@ -1690,7 +1787,8 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlmeif (jiffies_to_msecs (jiffies - competitor->last_scanned) >= mlme->roam_scanr_exp_ms) goto exit; -if (competitor->network.rssi - mlme->cur_network_scanned->network.rssi < mlme->roam_rssi_diff_th) + rssi_diff = competitor->network.rssi - mlme->cur_network_scanned->network.rssi; +if (rssi_diff < mlme->roam_rssi_diff_th) goto exit;if (*candidate && (*candidate)->network.rssi >= competitor->network.rssi)@@ -1763,9 +1861,12 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme/* check ssid, if needed */ if (mlme->assoc_ssid.ssid[0 ] && mlme->assoc_ssid.ssid_length) { -if (competitor->network.ssid.ssid_length != mlme->assoc_ssid.ssid_length - ||memcmp (competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, mlme->assoc_ssid.ssid_length) - ) +u8 *ssid_comp = competitor->network.ssid.ssid; +u8 *ssid_mlme = mlme->assoc_ssid.ssid; +u32 len_comp = competitor->network.ssid.ssid_length; +u32 len_mlme = mlme->assoc_ssid.ssid_length; + +if (len_comp != len_mlme ||memcmp (ssid_comp, ssid_mlme, len_mlme)) goto exit; }
drivers/staging/rtl8723bs/core/rtw_mlme.c signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecurity · line 1987
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +2
-1@@ -1882,7 +1983,8 @@ signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecurityreturn res; } -signed int rtw_set_key (struct adapter *adapter,struct security_priv *psecuritypriv,signed int keyid,u8 set_tx,bool enqueue) +signed int rtw_set_key (struct adapter *adapter,struct security_priv *psecuritypriv, +signed int keyid,u8 set_tx,bool enqueue)
^^^^^
Wrong alignment here too.
drivers/staging/rtl8723bs/core/rtw_mlme.c signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp · line 2063
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +2
-1{u8 keylen;struct cmd_obj *pcmd;@@ -1957,7 +2059,8 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp }/* adjust ies for rtw_joinbss_cmd in WMM */ -int rtw_restruct_wmm_ie (struct adapter *adapter,u8 *in_ie,u8 *out_ie,uint in_len,uint initial_out_len) +int rtw_restruct_wmm_ie (struct adapter *adapter,u8 *in_ie,u8 *out_ie, +uint in_len,uint initial_out_len)
^^^^^
Here as well.
Quoted 66 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +15
-6{unsigned int ielength =0 ;unsigned int i, j;@@ -2061,7 +2164,8 @@ static void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie) wrqu.data.length = p - buff; - wrqu.data.length = (wrqu.data.length <IW_CUSTOM_MAX ) ? wrqu.data.length :IW_CUSTOM_MAX ; + wrqu.data.length =min_t (typeof (wrqu.data.length), + wrqu.data.length,IW_CUSTOM_MAX );kfree (buff); }@@ -2091,7 +2195,8 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u ielength += psecuritypriv->wps_ie_len; }else if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) || (authmode ==WLAN_EID_RSN )) {/* copy RSN or SSN */ -memcpy (&out_ie[ielength], &psecuritypriv->supplicant_ie[0 ], psecuritypriv->supplicant_ie[1 ] +2 ); +memcpy (&out_ie[ielength], &psecuritypriv->supplicant_ie[0 ], + psecuritypriv->supplicant_ie[1 ] +2 ); ielength += psecuritypriv->supplicant_ie[1 ] +2 ;rtw_report_sec_ie (adapter, authmode, psecuritypriv->supplicant_ie); }@@ -2129,7 +2234,8 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)struct security_priv *psecuritypriv = &adapter->securitypriv;struct wlan_network *cur_network = &adapter->mlmepriv.cur_network; - pdev_network->privacy = (psecuritypriv->dot11PrivacyAlgrthm >0 ?1 :0 ) ;/* adhoc no 802.1x */ +/* adhoc no 802.1x */ + pdev_network->privacy = (psecuritypriv->dot11PrivacyAlgrthm >0 ?1 :0 ); pdev_network->rssi =0 ;@@ -2159,14 +2265,18 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)/* 1. Supported rates */ /* 2. IE */ -/* rtw_set_supported_rate(pdev_network->supported_rates, pregistrypriv->wireless_mode) ; will be called in rtw_generate_ie */ +/* rtw_set_supported_rate(pdev_network->supported_rates, +* pregistrypriv->wireless_mode); will be called in rtw_generate_ie +*/ sz =rtw_generate_ie (pregistrypriv); pdev_network->ie_length = sz; pdev_network->length =get_wlan_bssid_ex_sz ((struct wlan_bssid_ex *)pdev_network); -/* notes: translate ie_length & length after assign the length to cmdsz in createbss_cmd(); */ +/* notes: translate ie_length & length after assign the +* length to cmdsz in createbss_cmd(); +*/ /* pdev_network->ie_length = cpu_to_le32(sz); */ }@@ -2178,7 +2288,9 @@ void rtw_joinbss_reset(struct adapter *padapter)struct ht_priv *phtpriv = &pmlmepriv->htpriv; -/* todo: if you want to do something io/reg/hw setting before join_bss, please add code here */ +/* todo: if you want to do something io/reg/hw setting before join_bss, +* please add code here +*/ pmlmepriv->num_FortyMHzIntolerant =0 ;
drivers/staging/rtl8723bs/core/rtw_mlme.c void rtw_build_wmm_ie_ht(struct adapter *padapter, u8 *out_ie, uint *pout_len) · line 2384
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +2
-1@@ -2268,7 +2380,8 @@ void rtw_build_wmm_ie_ht(struct adapter *padapter, u8 *out_ie, uint *pout_len) }/* the function is >= passive_level */ -unsigned int rtw_restructure_ht_ie (struct adapter *padapter,u8 *in_ie,u8 *out_ie,uint in_len,uint *pout_len,u8 channel) +unsigned int rtw_restructure_ht_ie (struct adapter *padapter,u8 *in_ie,u8 *out_ie, +uint in_len,uint *pout_len,u8 channel)
^^^^^
Wrong alignment here as well.
Quoted 51 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +9
-5{u32 ielen, out_len;enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor;@@ -2349,7 +2462,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_/* update default supported_mcs_set */ if (stbc_rx_enable) - ht_capie.cap_info |=cpu_to_le16 (IEEE80211_HT_CAP_RX_STBC_1R );/* RX STBC One spatial stream */ +/* RX STBC One spatial stream */ + ht_capie.cap_info |=cpu_to_le16 (IEEE80211_HT_CAP_RX_STBC_1R );set_mcs_rate_by_mask (ht_capie.mcs.rx_mask,MCS_RATE_1R );@@ -2415,7 +2529,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe/* check Max Rx A-MPDU Size */ len =0 ; - p =rtw_get_ie (pie +sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_CAPABILITY , &len, ie_len -sizeof (struct ndis_802_11_fix_ie )); + p =rtw_get_ie (pie +sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_CAPABILITY , + &len, ie_len -sizeof (struct ndis_802_11_fix_ie ));if (p && len >0 ) { pht_capie = (struct ieee80211_ht_cap *)(p +2 ); max_ampdu_sz = (pht_capie->ampdu_params_info &IEEE80211_HT_CAP_AMPDU_FACTOR );@@ -2425,7 +2540,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe } len =0 ; - p =rtw_get_ie (pie +sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_OPERATION , &len, ie_len -sizeof (struct ndis_802_11_fix_ie )); + p =rtw_get_ie (pie +sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_OPERATION , + &len, ie_len -sizeof (struct ndis_802_11_fix_ie ));if (p && len >0 ) {/* todo: */ }@@ -2438,13 +2554,14 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & BIT(1)) && (pmlmeinfo->HT_info.infos[0] & BIT(2))) {int i; +u8 *mcs_rate = pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate;/* update the MCS set */ for (i =0 ; i <16 ; i++) - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= pmlmeext->default_supported_mcs_set[i]; + mcs_rate[i] &= pmlmeext->default_supported_mcs_set[i];/* update the MCS rates */ -set_mcs_rate_by_mask (pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate,MCS_RATE_1R ); +set_mcs_rate_by_mask (mcs_rate,MCS_RATE_1R );/* switch to the 40M Hz mode according to the AP */ /* pmlmeext->cur_bwmode = CHANNEL_WIDTH_40; */
drivers/staging/rtl8723bs/core/rtw_mlme.c void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network) · line 2682
Quoted 9 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +2
-1@@ -2558,7 +2675,8 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)struct wlan_network *cur_network = &pmlmepriv->cur_network;if (rtw_to_roam (padapter) >0 ) { -memcpy (&pmlmepriv->assoc_ssid, &cur_network->network.ssid,sizeof (struct ndis_802_11_ssid )); +memcpy (&pmlmepriv->assoc_ssid, &cur_network->network.ssid, +sizeof (struct ndis_802_11_ssid )); pmlmepriv->assoc_by_bssid = false;
Best regards,
Luka Gejak
Re: [PATCH v3 2/5] staging: rtl8723bs: rtw_mlme: fix lines exceeding 100 columns
Quoted 6 lines · Luka Gejak
Quoted 5 lines · Salman Alghamdi
Wrap long lines and extract local variables to bring all lines within the 100 column limit.
Signed-off-by Salman Alghamdi <[email protected]>---
...
/* Added by Albert 2009/02/18 */
Quoted 11 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c void rtw_reset_securitypriv(struct adapter *adapter) · line 1183
Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +3
-2-/* Restore the PMK information to securitypriv structure for the following connection. */ -memcpy (&adapter->securitypriv.PMKIDList[0 ], &backupPMKIDList[0 ],sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); +/* Restore the PMK information to securitypriv structure +* for the following connection. +*/ This is not aligned correctly either. f from from should go under R from Restore:
/* Restore the PMK information to securitypriv structure
* for the following connection.
*/
...
Hi Salman,
this is the only viable change you need to make from this email. I have verified that the other ones are visual glitches. Other emails are still valid and you still have to send v4 to address other isues. Best regards,
Luka Gejak
Re: [PATCH v3 2/5] staging: rtl8723bs: rtw_mlme: fix lines exceeding 100 columns
In reply to Salman AlghamdiQuoted 5 lines · Salman Alghamdi
Wrap long lines and extract local variables to bring all lines within the 100 column limit.
Signed-off-by Salman Alghamdi <[email protected]>---
...
Quoted 7 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +0
-3@@ -746,9 +791,13 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)rtw_indicate_connect (adapter); }else {if (rtw_to_roam (adapter) !=0 ) { -if (rtw_dec_to_roam (adapter) ==0 - || _SUCCESS !=rtw_sitesurvey_cmd (adapter, &pmlmepriv->assoc_ssid,1 ,NULL ,0 ) - ) {
drivers/staging/rtl8723bs/core/rtw_mlme.c void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) · line 803
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +7
-0+if (rtw_dec_to_roam (adapter) ==0 ) { +rtw_set_to_roam (adapter,0 ); +rtw_free_assoc_resources (adapter,1 ); +rtw_indicate_disconnect (adapter); + }else if (rtw_sitesurvey_cmd (adapter, + &pmlmepriv->assoc_ssid, +1 ,NULL ,0 ) != _SUCCESS) {rtw_set_to_roam (adapter,0 );rtw_free_assoc_resources (adapter,1 );rtw_indicate_disconnect (adapter);
This isn't really what I had in mind and it isn't acceptable because you are repeating yourself. I thought something like:
bool roam_failed = false;
if (rtw_dec_to_roam(adapter) == 0)
roam_failed = true;
else if (rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid,
1, NULL, 0) != _SUCCESS)
roam_failed = true;
if (roam_failed) {
rtw_set_to_roam(adapter, 0);
rtw_free_assoc_resources(adapter, 1);
rtw_indicate_disconnect(adapter);
}...
Best regards,
Luka Gejak
Re: [PATCH v3 2/5] staging: rtl8723bs: rtw_mlme: fix lines exceeding 100 columns
In reply to Salman AlghamdiQuoted 5 lines · Salman Alghamdi
Wrap long lines and extract local variables to bring all lines within the 100 column limit.
Signed-off-by Salman Alghamdi <[email protected]>---
This patch is too big and too complicated. If you send a patch that only adds newlines, then I have automated ways to review that but when you're adding variables and change code to use min_t() then it's hard to review.
Quoted 92 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c | 284 +++++++++++++++------- 1 file changed, 201 insertions(+), 83 deletions(-)drivers/staging/rtl8723bs/core/rtw_mlme.c +26
-11@@ -52,7 +52,10 @@ int rtw_init_mlme_priv(struct adapter *padapter) pmlmepriv->pscanned =NULL ; pmlmepriv->fw_state =WIFI_STATION_STATE ;/* Must sync with rtw_wdev_alloc() */ pmlmepriv->cur_network.network.infrastructure_mode = Ndis802_11AutoUnknown; - pmlmepriv->scan_mode =SCAN_ACTIVE ;/* 1: active, 0: passive. Maybe someday we should rename this varable to "active_mode" (Jeff) */ +/* 1: active, 0: passive. Maybe someday we should rename +* this varable to "active_mode" (Jeff) +*/ + pmlmepriv->scan_mode =SCAN_ACTIVE ;spin_lock_init (&pmlmepriv->lock);INIT_LIST_HEAD (&pmlmepriv->free_bss_pool.queue);@@ -125,7 +128,8 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)rtw_free_mlme_ie_data (&pmlmepriv->p2p_beacon_ie, &pmlmepriv->p2p_beacon_ie_len);rtw_free_mlme_ie_data (&pmlmepriv->p2p_probe_req_ie, &pmlmepriv->p2p_probe_req_ie_len);rtw_free_mlme_ie_data (&pmlmepriv->p2p_probe_resp_ie, &pmlmepriv->p2p_probe_resp_ie_len); -rtw_free_mlme_ie_data (&pmlmepriv->p2p_go_probe_resp_ie, &pmlmepriv->p2p_go_probe_resp_ie_len); +rtw_free_mlme_ie_data (&pmlmepriv->p2p_go_probe_resp_ie, + &pmlmepriv->p2p_go_probe_resp_ie_len);rtw_free_mlme_ie_data (&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc_req_ie_len); }@@ -369,7 +373,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea (d_cap & WLAN_CAPABILITY_ESS)); } -struct wlan_network *_rtw_find_same_network (struct __queue *scanned_queue,struct wlan_network *network) +struct wlan_network *_rtw_find_same_network (struct __queue *scanned_queue, +struct wlan_network *network) {struct list_head *phead, *plist;struct wlan_network *found =NULL ;@@ -420,7 +425,8 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,long rssi_final;/* The rule below is 1/5 for sample value, 4/5 for history value */ -if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) &&is_same_network (&padapter->mlmepriv.cur_network.network, src,0 )) { +if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) && +is_same_network (&padapter->mlmepriv.cur_network.network, src,0 )) {/* Take the recvpriv's value for the connected AP*/ ss_final = padapter->recvpriv.signal_strength; sq_final = padapter->recvpriv.signal_qual;@@ -431,11 +437,15 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, rssi_final = rssi_ori; }else {if (sq_smp !=101 ) {/* from the right channel */ - ss_final = ((u32)(src->phy_info.signal_strength) + (u32)(dst->phy_info.signal_strength) *4 ) /5 ; - sq_final = ((u32)(src->phy_info.signal_quality) + (u32)(dst->phy_info.signal_quality) *4 ) /5 ; + ss_final = ((u32)(src->phy_info.signal_strength) + + (u32)(dst->phy_info.signal_strength) *4 ) /5 ; + sq_final = ((u32)(src->phy_info.signal_quality) + + (u32)(dst->phy_info.signal_quality) *4 ) /5 ; rssi_final = (src->rssi + dst->rssi *4 ) /5 ; }else { -/* bss info not receiving from the right channel, use the original RX signal infos */ +/* bss info not receiving from the right channel, use +* the original RX signal infos +*/ ss_final = dst->phy_info.signal_strength; sq_final = dst->phy_info.signal_quality; rssi_final = dst->rssi;@@ -462,13 +472,18 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex &pmlmepriv->cur_network.network, &pmlmepriv->cur_network.network); -if (check_fwstate (pmlmepriv, _FW_LINKED) && (is_same_network (&pmlmepriv->cur_network.network, pnetwork,0 ))) { +if (check_fwstate (pmlmepriv, _FW_LINKED) && + (is_same_network (&pmlmepriv->cur_network.network, pnetwork,0 ))) { +u32 ie_len; +u8 *ie; +update_network (&pmlmepriv->cur_network.network, pnetwork, adapter, true); -if (pmlmepriv->cur_network.network.ie_length <sizeof (struct ndis_802_11_fix_ie )) + ie_len = pmlmepriv->cur_network.network.ie_length; +if (ie_len <sizeof (struct ndis_802_11_fix_ie ))return ; -rtw_update_protection (adapter, (pmlmepriv->cur_network.network.ies) +sizeof (struct ndis_802_11_fix_ie ), - pmlmepriv->cur_network.network.ie_length -sizeof (struct ndis_802_11_fix_ie )); + ie = pmlmepriv->cur_network.network.ies +sizeof (struct ndis_802_11_fix_ie ); +rtw_update_protection (adapter, ie, ie_len -sizeof (struct ndis_802_11_fix_ie )); } }
drivers/staging/rtl8723bs/core/rtw_mlme.c static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network · line 623
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +2
-1@@ -604,7 +619,16 @@ static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network privacy = pnetwork->network.privacy;if (check_fwstate (pmlmepriv,WIFI_UNDER_WPS )) { -if (rtw_get_wps_ie (pnetwork->network.ies + _FIXED_IE_LENGTH_, pnetwork->network.ie_length - _FIXED_IE_LENGTH_,NULL , &wps_ielen)) +u8 *ie_ptr; +u32 ie_len_val;
Why is this not call ie and ie_len like the earlier code? Also the declarations should be in reverse Christmas tree order.
long long variable_name; medium name; short n;
When you start doing things which are more complicated than just adding newlines, then it gets controversial in ways you don't expect. For example, we don't really use min_t() these days.
drivers/staging/rtl8723bs/core/rtw_mlme.c static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network · line 626
Quoted 3 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +3
-0+ +if (pnetwork->network.ie_length < _FIXED_IE_LENGTH_) +return false;
This is a behavior change so we can't merge it.
regards,
dan carpenter
Quoted 8 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +5
-0+ + ie_ptr = pnetwork->network.ies + _FIXED_IE_LENGTH_; + ie_len_val = pnetwork->network.ie_length - _FIXED_IE_LENGTH_; + +if (rtw_get_wps_ie (ie_ptr, ie_len_val,NULL , &wps_ielen))return true;else return false;
Re: [PATCH v3 2/5] staging: rtl8723bs: rtw_mlme: fix lines exceeding 100 columns
Quoted 4 lines · Dan Carpenter
This patch is too big and too complicated. If you send a patch that only adds newlines, then I have automated ways to review that but when you're adding variables and change code to use
min_t()then it's hard to review.
The introduction of some variables was made in order to fix line length for certain function calls that has long named parameters. Should I separate long line fixes into two patches, one only for simple newlines and the other that introduces variables?
Quoted 4 lines
When you start doing things which are more complicated than just adding newlines, then it gets controversial in ways you don't expect. For example, we don't really use
min_t()these days.
I tried using min() first as Luka noted me, but checkpatch.pl warned to replace it with min_t() instead. What is the preferred function to use in this case?
Regards,
Salman Alghamdi
Re: [PATCH v3 2/5] staging: rtl8723bs: rtw_mlme: fix lines exceeding 100 columns
Quoted 11 lines · Salman Alghamdi
Quoted 4 lines · Dan Carpenter
This patch is too big and too complicated. If you send a patch that only adds newlines, then I have automated ways to review that but when you're adding variables and change code to use
min_t()then it's hard to review.The introduction of some variables was made in order to fix line length for certain function calls that has long named parameters. Should I separate long line fixes into two patches, one only for simple newlines and the other that introduces variables?
Yes, that could work.
Quoted 9 lines
Quoted 5 lines
When you start doing things which are more complicated than just adding newlines, then it gets controversial in ways you don't expect. For example, we don't really use
min_t()these days.I tried using
min()first as Luka noted me, but checkpatch.pl warned to replace it withmin_t()instead. What is the preferred function to use in this case?
You could use umin() since both of these are unsigned, but check that just in case.
Quoted 4 lines
Regards,
Salman Alghamdi
Best regards,
Luka Gejak
PATCH v3 3/5 staging: rtl8723bs: rtw_mlme: remove dead commented-out code
In reply to Salman AlghamdiRemove commented-out code and its related comments/notes.
Signed-off-by Salman Alghamdi <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 15 --------------- 1 file changed, 15 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +0 -15
@@ -758,9 +758,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)struct wlan_bssid_ex *pdev_network = ®s->dev_network;u8 *pibss = regs->dev_network.mac_address; -/* pmlmepriv->fw_state ^= _FW_UNDER_SURVEY; -* because don't set assoc_timer -*/ _clr_fwstate_ (pmlmepriv, _FW_UNDER_SURVEY); memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid,
@@ -1721,12 +1718,8 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter) should_enter_ps =traffic_status_watchdog (adapter, true);if (should_enter_ps) { -/* rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_ENTER, 1); */ rtw_hal_dm_watchdog_in_lps (adapter); }else { -/* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) -* in traffic_status_watchdog() -*/ } }else {
@@ -2265,19 +2258,11 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)/* 1. Supported rates */ /* 2. IE */ -/* rtw_set_supported_rate(pdev_network->supported_rates, -* pregistrypriv->wireless_mode); will be called in rtw_generate_ie -*/ sz =rtw_generate_ie (pregistrypriv); pdev_network->ie_length = sz; pdev_network->length =get_wlan_bssid_ex_sz ((struct wlan_bssid_ex *)pdev_network); - -/* notes: translate ie_length & length after assign the -* length to cmdsz in createbss_cmd(); -*/ -/* pdev_network->ie_length = cpu_to_le32(sz); */ }/* the function is at passive_level */
Signature · 1 line
2.54.0
Re: [PATCH v3 3/5] staging: rtl8723bs: rtw_mlme: remove dead commented-out code
Quoted 22 lines · Salman Alghamdi
Remove commented-out code and its related comments/notes.
Signed-off-by Salman Alghamdi <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 15 --------------- 1 file changed, 15 deletions(-)drivers/staging/rtl8723bs/core/rtw_mlme.c +0
-3@@ -758,9 +758,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)struct wlan_bssid_ex *pdev_network = ®s->dev_network;u8 *pibss = regs->dev_network.mac_address; -/* pmlmepriv->fw_state ^= _FW_UNDER_SURVEY; -* because don't set assoc_timer -*/ _clr_fwstate_ (pmlmepriv, _FW_UNDER_SURVEY); memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid,
drivers/staging/rtl8723bs/core/rtw_mlme.c void rtw_dynamic_check_timer_handler(struct adapter *adapter) · line 1723
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +0
-4@@ -1721,12 +1718,8 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter) should_enter_ps =traffic_status_watchdog (adapter, true);if (should_enter_ps) { -/* rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_ENTER, 1); */ rtw_hal_dm_watchdog_in_lps (adapter); }else { -/* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) -* in traffic_status_watchdog() -*/ }
By removing these comments above you are leaving empty else block that should be removed.
Quoted 12 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +0
-3}else {@@ -2265,19 +2258,11 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)/* 1. Supported rates */ /* 2. IE */ -/* rtw_set_supported_rate(pdev_network->supported_rates, -* pregistrypriv->wireless_mode); will be called in rtw_generate_ie -*/ sz =rtw_generate_ie (pregistrypriv); pdev_network->ie_length = sz;
drivers/staging/rtl8723bs/core/rtw_mlme.c void rtw_update_registrypriv_dev_network(struct adapter *adapter) · line 2268
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +0
-5pdev_network->length =get_wlan_bssid_ex_sz ((struct wlan_bssid_ex *)pdev_network); - -/* notes: translate ie_length & length after assign the -* length to cmdsz in createbss_cmd(); -*/ -/* pdev_network->ie_length = cpu_to_le32(sz); */ }/* the function is at passive_level */
Best regards,
Luka Gejak
PATCH v3 4/5 staging: rtl8723bs: rtw_mlme: consolidate capability comparisons lines
In reply to Salman AlghamdiPlace capability comparisons on single lines.
Signed-off-by Salman Alghamdi <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -4
@@ -367,10 +367,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 feareturn (src->ssid.ssid_length == dst->ssid.ssid_length) && ((!memcmp (src->mac_address, dst->mac_address,ETH_ALEN ))) && ((!memcmp (src->ssid.ssid, dst->ssid.ssid, src->ssid.ssid_length))) && - ((s_cap &WLAN_CAPABILITY_IBSS ) == - (d_cap &WLAN_CAPABILITY_IBSS )) && - ((s_cap &WLAN_CAPABILITY_ESS ) == - (d_cap &WLAN_CAPABILITY_ESS )); + ((s_cap &WLAN_CAPABILITY_IBSS ) == (d_cap &WLAN_CAPABILITY_IBSS )) && + ((s_cap &WLAN_CAPABILITY_ESS ) == (d_cap &WLAN_CAPABILITY_ESS )); } struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue,
Signature · 1 line
2.54.0
PATCH v3 5/5 staging: rtl8723bs: rtw_mlme: add blank line for readability
In reply to Salman AlghamdiAdd a blank line between the WIFI_UNDER_WPS block and the wifi_spec block to improve readability.
Signed-off-by Salman Alghamdi <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -0
@@ -631,6 +631,7 @@ static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_networkelse return false; } +if (adapter->registrypriv.wifi_spec ==1 ) {/* for correct flow of 8021X to do.... */ u8 *p =NULL ;uint ie_len =0 ;
Signature · 1 line
2.54.0
I noticed the function signature continuation lines appear misaligned in the mailing list archive. I've verified the alignment in the file using cat -A which shows correct tabs+spaces:
^I^I^I^I^I struct wlan_network *network)
The misalignment appears to be a rendering artifact in the email client or archive. If you can verify by applying the patch locally I'd appreciate confirmation, or if there's a known fix I'm happy to address it.
Regards,
Salman Alghamdi.
Quoted 6 lines · Salman Alghamdi
I noticed the function signature continuation lines appear misaligned in the mailing list archive. I've verified the alignment in the file using cat -A which shows correct tabs+spaces:
^I^I^I^I^I struct
wlan_network*network)
Quoted 7 lines
The misalignment appears to be a rendering artifact in the email client or archive. If you can verify by applying the patch locally I'd appreciate confirmation, or if there's a known fix I'm happy to address it.
Regards,
Salman Alghamdi.
I am confused in email it's misaligned but when I apply and check file it's looking good. Anyone knows why?
Best regards,
Luka Gejak
Quoted 12 lines · Luka Gejak
Quoted 11 lines · Salman Alghamdi
I noticed the function signature continuation lines appear misaligned in the mailing list archive. I've verified the alignment in the file using cat -A which shows correct tabs+spaces:
^I^I^I^I^I struct
wlan_network*network)The misalignment appears to be a rendering artifact in the email client or archive. If you can verify by applying the patch locally I'd appreciate confirmation, or if there's a known fix I'm happy to address it.
Quoted 5 lines
Quoted 2 lines
Regards,
Salman Alghamdi.I am confused in email it's misaligned but when I apply and check file it's looking good. Anyone knows why?
It's because in a diff every line starts with an extra [ +-] char.
regards,
dan carpenter