Fix style and formatting issues in rtw_mlme.c
cover Fix style and formatting issues in rtw_mlme.c
This patchest addresses multiple style and formatting issues in the file drivers/staging/rtl8723bs/core/rtw_mlme.c.
These issues are all reported by checkpatch.pl
Wambui Karuga (4):
staging: rtl8723bs: Remove comparisons to NULL in conditionals
staging: rtl8723bs: Remove unnecessary braces for single statements
staging: rtl8723bs: Remove comparisons to booleans in conditionals.
staging: rtl8723bs: Remove unnecessary blank lines
drivers/staging/rtl8723bs/core/rtw_mlme.c | 157 +++++++--------------- 1 file changed, 48 insertions(+), 109 deletions(-)
Signature · 1 line
2.23.0
PATCH 1/4 staging: rtl8723bs: Remove comparisons to NULL in conditionals
Remove most comparisons to NULL in conditionals in drivers/staging/rtl8723bs/core/rtw_mlme.c Issues reported by checkpatch.pl as:
CHECK: Comparison to NULL could be written
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 46 +++++++++++------------ 1 file changed, 23 insertions(+), 23 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +23 -23
@@ -40,7 +40,7 @@ int rtw_init_mlme_priv(struct adapter *padapter) pbuf =vzalloc (array_size (MAX_BSS_CNT ,sizeof (struct wlan_network ))); -if (pbuf ==NULL ) { +if (!pbuf) { res = _FAIL; goto exit; }
@@ -185,7 +185,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwor/* _irqL irqL; */ struct __queue *free_queue = &(pmlmepriv->free_bss_pool); -if (pnetwork ==NULL ) +if (!pnetwork)return ;if (pnetwork->fixed == true)
@@ -220,7 +220,7 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *struct __queue *free_queue = &(pmlmepriv->free_bss_pool); -if (pnetwork ==NULL ) +if (!pnetwork)return ;if (pnetwork->fixed == true)
@@ -633,7 +633,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t/* If there are no more slots, expire the oldest */ /* list_del_init(&oldest->list); */ pnetwork = oldest; -if (pnetwork ==NULL ) { +if (!pnetwork) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("\n\n\nsomething wrong here\n\n\n" )); goto exit; }
@@ -654,7 +654,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t pnetwork =rtw_alloc_network (pmlmepriv);/* will update scan_time */ -if (pnetwork ==NULL ) { +if (!pnetwork) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("\n\n\nsomething wrong here\n\n\n" )); goto exit; }
@@ -738,7 +738,7 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor privacy = pnetwork->network.Privacy;if (check_fwstate (pmlmepriv,WIFI_UNDER_WPS )) { -if (rtw_get_wps_ie (pnetwork->network.IEs+_FIXED_IE_LENGTH_, pnetwork->network.IELength-_FIXED_IE_LENGTH_,NULL , &wps_ielen) !=NULL ) +if (rtw_get_wps_ie (pnetwork->network.IEs+_FIXED_IE_LENGTH_, pnetwork->network.IELength-_FIXED_IE_LENGTH_,NULL , &wps_ielen))return true;else return false;
@@ -1166,7 +1166,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, strstruct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; psta =rtw_get_stainfo (pstapriv, pnetwork->network.MacAddress); -if (psta ==NULL ) { +if (!psta) { psta =rtw_alloc_stainfo (pstapriv, pnetwork->network.MacAddress); }
@@ -1413,7 +1413,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)/* s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode */ if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { ptarget_sta =rtw_joinbss_update_stainfo (adapter, pnetwork); -if (ptarget_sta ==NULL ) { +if (!ptarget_sta) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Can't update stainfo when joinbss_event callback\n" ));spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); goto ignore_joinbss_callback;
@@ -1503,7 +1503,7 @@ void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *psta, u3 {u16 media_status_rpt; -if (psta ==NULL ) +if (!psta)return ; media_status_rpt = (u16)((psta->mac_id<<8 )|mstatus);/* MACID|OPMODE:1 connect */
@@ -1561,7 +1561,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)/* for AD-HOC mode */ psta =rtw_get_stainfo (&adapter->stapriv, pstassoc->macaddr); -if (psta !=NULL ) { +if (psta) {/* the sta have been in sta_info_queue => do nothing */ RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Error: rtw_stassoc_event_callback: sta has been in sta_hash_queue\n" ));
@@ -1570,7 +1570,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) } psta =rtw_alloc_stainfo (&adapter->stapriv, pstassoc->macaddr); -if (psta ==NULL ) { +if (!psta) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Can't alloc sta_info when rtw_stassoc_event_callback\n" ));return ; }
@@ -1993,7 +1993,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme)struct wlan_network *pnetwork =NULL ;struct wlan_network *candidate =NULL ; -if (mlme->cur_network_scanned ==NULL ) { +if (!mlme->cur_network_scanned) {rtw_warn_on (1 );return ret; }
@@ -2006,7 +2006,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme)while (phead != mlme->pscanned) { pnetwork = LIST_CONTAINOR(mlme->pscanned, struct wlan_network, list); -if (pnetwork ==NULL ) { +if (!pnetwork) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("%s return _FAIL:(pnetwork == NULL)\n" , __func__)); ret = _FAIL; goto exit;
@@ -2024,7 +2024,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) } -if (candidate ==NULL ) { +if (!candidate) {DBG_871X ("%s: return _FAIL(candidate == NULL)\n" , __func__); ret = _FAIL; goto exit;
@@ -2141,7 +2141,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)while (phead != pmlmepriv->pscanned) { pnetwork = LIST_CONTAINOR(pmlmepriv->pscanned, struct wlan_network, list); -if (pnetwork ==NULL ) { +if (!pnetwork) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("%s return _FAIL:(pnetwork == NULL)\n" , __func__)); ret = _FAIL; goto exit;
@@ -2159,7 +2159,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) } -if (candidate ==NULL ) { +if (!candidate) {DBG_871X ("%s: return _FAIL(candidate == NULL)\n" , __func__);#ifdef CONFIG_WOWLAN _clr_fwstate_ (pmlmepriv, _FW_LINKED|_FW_UNDER_LINKING);
@@ -2200,13 +2200,13 @@ sint rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv)sint res = _SUCCESS; pcmd =rtw_zmalloc (sizeof (struct cmd_obj )); -if (pcmd ==NULL ) { +if (!pcmd) { res = _FAIL;/* try again */ goto exit; } psetauthparm =rtw_zmalloc (sizeof (struct setauth_parm )); -if (psetauthparm ==NULL ) { +if (!psetauthparm) {kfree ((unsigned char *)pcmd); res = _FAIL; goto exit;
@@ -2240,7 +2240,7 @@ sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, ssint res = _SUCCESS; psetkeyparm =rtw_zmalloc (sizeof (struct setkey_parm )); -if (psetkeyparm ==NULL ) { +if (!psetkeyparm) { res = _FAIL; goto exit; }
@@ -2291,7 +2291,7 @@ sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, sif (enqueue) { pcmd =rtw_zmalloc (sizeof (struct cmd_obj )); -if (pcmd ==NULL ) { +if (!pcmd) {kfree ((unsigned char *)psetkeyparm); res = _FAIL;/* try again */ goto exit;
@@ -2672,7 +2672,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ ht_capie.cap_info |=cpu_to_le16 (IEEE80211_HT_CAP_SGI_20 );/* Get HT BW */ -if (in_ie ==NULL ) { +if (!in_ie) {/* TDLS: TODO 20/40 issue */ if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) { operation_bw = padapter->mlmeextpriv.cur_bwmode;
@@ -2787,7 +2787,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ phtpriv->ht_option = true; -if (in_ie !=NULL ) { +if (in_ie) { p =rtw_get_ie (in_ie, _HT_ADD_INFO_IE_, &ielen, in_len);if (p && (ielen ==sizeof (struct ieee80211_ht_addt_info ))) { out_len = *pout_len;
@@ -2954,7 +2954,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfrreturn ; } -if (psta ==NULL ) { +if (!psta) {DBG_871X ("%s, psta ==NUL\n" , __func__);return ; }
Signature · 1 line
2.23.0
PATCH 2/4 staging: rtl8723bs: Remove unnecessary braces for single statements
In reply to Wambui KarugaClean up multiple unnecessary braces around single statement blocks in drivers/staging/rtl8723bs/core/rtw_mlme.c
Issues reported by checkpatch.pl as:
WARNING: braces {} are not necessary for single statement blocks or
WARNING: braces {} are not necessary for any arm of this statement
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 37 ++++++++--------------- 1 file changed, 12 insertions(+), 25 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +12 -25
@@ -112,9 +112,8 @@ void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) {if (pmlmepriv) {rtw_free_mlme_priv_ie_data (pmlmepriv); -if (pmlmepriv->free_bss_buf) { +if (pmlmepriv->free_bss_buf)vfree (pmlmepriv->free_bss_buf); - } } }
@@ -753,11 +752,10 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetworif (psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPA2PSK) { p =rtw_get_ie (pnetwork->network.IEs + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len, (pnetwork->network.IELength - _BEACON_IE_OFFSET_)); -if (p && ie_len >0 ) { +if (p && ie_len >0 ) bselected = true; - }else { +else bselected = false; - } } }
@@ -822,9 +820,8 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)/* lock pmlmepriv->lock when you accessing network_q */ if ((check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) == false) { -if (pnetwork->Ssid.Ssid[0 ] ==0 ) { +if (pnetwork->Ssid.Ssid[0 ] ==0 ) pnetwork->Ssid.SsidLength =0 ; - }rtw_add_network (adapter, pnetwork); }
@@ -893,9 +890,8 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) pmlmepriv->fw_state =WIFI_ADHOC_MASTER_STATE ; -if (rtw_createbss_cmd (adapter) != _SUCCESS) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Error =>rtw_createbss_cmd status FAIL\n" )); - } +if (rtw_createbss_cmd (adapter) != _SUCCESS) +RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Error =>rtw_createbss_cmd status FAIL\n" )); pmlmepriv->to_join = false; }
@@ -1166,9 +1162,8 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, strstruct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; psta =rtw_get_stainfo (pstapriv, pnetwork->network.MacAddress); -if (!psta) { +if (!psta) psta =rtw_alloc_stainfo (pstapriv, pnetwork->network.MacAddress); - }if (psta) {/* update ptarget_sta */
@@ -1347,11 +1342,10 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)rtw_get_encrypt_decrypt_from_registrypriv (adapter); -if (pmlmepriv->assoc_ssid.SsidLength ==0 ) { +if (pmlmepriv->assoc_ssid.SsidLength ==0 )RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("@@@@@ joinbss event call back for Any SSid\n" )); - }else { +else RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("@@@@@ rtw_joinbss_event_callback for SSid:%s\n" , pmlmepriv->assoc_ssid.Ssid)); - } the_same_macaddr = !memcmp (pnetwork->network.MacAddress, cur_network->network.MacAddress,ETH_ALEN );
@@ -1723,13 +1717,8 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)_clr_fwstate_ (pmlmepriv,WIFI_ADHOC_STATE ); } -if (rtw_createbss_cmd (adapter) != _SUCCESS) { - +if (rtw_createbss_cmd (adapter) != _SUCCESS)RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("***Error =>stadel_event_callback: rtw_createbss_cmd status FAIL***\n " )); - - } - - } }
@@ -1902,9 +1891,8 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter) } }else { -if (is_primary_adapter (adapter)) { +if (is_primary_adapter (adapter))rtw_dynamic_chk_wk_cmd (adapter); - } }/* auto site survey */
@@ -2988,9 +2976,8 @@ void rtw_append_exented_cap(struct adapter *padapter, u8 *out_ie, uint *pout_lenu8 *pframe; -if (phtpriv->bss_coexist) { +if (phtpriv->bss_coexist)SET_EXT_CAPABILITY_ELE_BSS_COEXIST (cap_content,1 ); - } pframe =rtw_set_ie (out_ie + *pout_len, EID_EXTCapability,8 , cap_content, pout_len); }
Signature · 1 line
2.23.0
PATCH 3/4 staging: rtl8723bs: Remove comparisons to booleans in conditionals.
In reply to Wambui KarugaRemove comparisons to true and false in multiple if statements in drivers/staging/rtl8723bs/core/rtw_mlme.c
Issues reported by checkpatch.pl as:
CHECK: Using comparison to false is error prone
CHECK: Using comparison to true is error prone
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 29 +++++++++++------------ 1 file changed, 14 insertions(+), 15 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +14 -15
@@ -187,7 +187,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetworif (!pnetwork)return ; -if (pnetwork->fixed == true) +if (pnetwork->fixed)return ; if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) ||
@@ -222,7 +222,7 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *if (!pnetwork)return ; -if (pnetwork->fixed == true) +if (pnetwork->fixed)return ;/* spin_lock_irqsave(&free_queue->lock, irqL); */
@@ -480,7 +480,7 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue) pwlan = LIST_CONTAINOR(plist, struct wlan_network, list); -if (pwlan->fixed != true) { +if (!pwlan->fixed) {if (oldest ==NULL ||time_after (oldest->last_scanned, pwlan->last_scanned)) oldest = pwlan; }
@@ -867,7 +867,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)rtw_set_signal_stat_timer (&adapter->recvpriv); -if (pmlmepriv->to_join == true) { +if (pmlmepriv->to_join) {if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) {if (check_fwstate (pmlmepriv, _FW_LINKED) == false) {set_fwstate (pmlmepriv, _FW_UNDER_LINKING);
@@ -1368,7 +1368,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) {/* s1. find ptarget_wlan */ if (check_fwstate (pmlmepriv, _FW_LINKED)) { -if (the_same_macaddr == true) { +if (the_same_macaddr) { ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.MacAddress); }else { pcur_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.MacAddress);
@@ -1843,7 +1843,7 @@ static void rtw_auto_scan_handler(struct adapter *padapter) goto exit; } -if (pmlmepriv->LinkDetectInfo.bBusyTraffic == true) { +if (pmlmepriv->LinkDetectInfo.bBusyTraffic) {DBG_871X (FUNC_ADPT_FMT " exit BusyTraffic\n" ,FUNC_ADPT_ARG (padapter)); goto exit; }
@@ -1863,20 +1863,20 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)if (!adapter)return ; -if (adapter->hw_init_completed == false) +if (!adapter->hw_init_completed)return ; -if ((adapter->bDriverStopped == true) || (adapter->bSurpriseRemoved == true)) +if (adapter->bDriverStopped || adapter->bSurpriseRemoved)return ; -if (adapter->net_closed == true) +if (adapter->net_closed)return ;if (is_primary_adapter (adapter))DBG_871X ("IsBtDisabled =%d, IsBtControlLps =%d\n" ,hal_btcoex_IsBtDisabled (adapter),hal_btcoex_IsBtControlLps (adapter)); -if ((adapter_to_pwrctl (adapter)->bFwCurrentInPSMode == true) - && (hal_btcoex_IsBtControlLps (adapter) == false) +if ((adapter_to_pwrctl (adapter)->bFwCurrentInPSMode) + && !(hal_btcoex_IsBtControlLps (adapter)) ) {u8 bEnterPS;
@@ -2047,7 +2047,7 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme/* check bssid, if needed */ -if (mlme->assoc_by_bssid == true) { +if (mlme->assoc_by_bssid) {if (memcmp (competitor->network.MacAddress, mlme->assoc_bssid,ETH_ALEN )) goto exit; }
@@ -2805,7 +2805,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channestruct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u8 cbw40_enable =0 ; -if (!phtpriv->ht_option)return ;
@@ -2815,7 +2814,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channeDBG_871X ("+rtw_update_ht_cap()\n" );/* maybe needs check if ap supports rx ampdu. */ -if ((phtpriv->ampdu_enable == false) && (pregistrypriv->ampdu_enable ==1 )) { +if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable ==1 ) {if (pregistrypriv->wifi_spec ==1 ) {/* remove this part because testbed AP should disable RX AMPDU */ /* phtpriv->ampdu_enable = false; */
@@ -2955,7 +2954,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr phtpriv = &psta->htpriv; -if ((phtpriv->ht_option == true) && (phtpriv->ampdu_enable == true)) { +if (phtpriv->ht_option && phtpriv->ampdu_enable) { issued = (phtpriv->agg_enable_bitmap>>priority)&0x1 ; issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1 ;
Signature · 1 line
2.23.0
Re: [PATCH 3/4] staging: rtl8723bs: Remove comparisons to booleans in conditionals.
drivers/staging/rtl8723bs/core/rtw_mlme.c void rtw_dynamic_check_timer_handler(struct adapter *adapter) · line 1879
Quoted 7 lines · Wambui Karuga
drivers/staging/rtl8723bs/core/rtw_mlme.c +2
-2if (is_primary_adapter (adapter))DBG_871X ("IsBtDisabled =%d, IsBtControlLps =%d\n" ,hal_btcoex_IsBtDisabled (adapter),hal_btcoex_IsBtControlLps (adapter)); -if ((adapter_to_pwrctl (adapter)->bFwCurrentInPSMode == true) - && (hal_btcoex_IsBtControlLps(adapter) == false) +if ((adapter_to_pwrctl (adapter)->bFwCurrentInPSMode) + && !(hal_btcoex_IsBtControlLps(adapter))
Delete the extra parentheses as well, because they don't make sense when we remove the == false comparison. It's part of doing "one thing" is to the whole thing and not leave bits undone.
&& !hal_btcoex_IsBtControlLps(adapter)
Quoted 21 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +1
-2) {u8 bEnterPS;@@ -2047,7 +2047,7 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme/* check bssid, if needed */ -if (mlme->assoc_by_bssid == true) { +if (mlme->assoc_by_bssid) {if (memcmp (competitor->network.MacAddress, mlme->assoc_bssid,ETH_ALEN )) goto exit; }@@ -2805,7 +2805,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channestruct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u8 cbw40_enable =0 ; -if (!phtpriv->ht_option)return ;
drivers/staging/rtl8723bs/core/rtw_mlme.c void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe · line 2817
Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +1
-1@@ -2815,7 +2814,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channeDBG_871X ("+rtw_update_ht_cap()\n" );/* maybe needs check if ap supports rx ampdu. */ -if ((phtpriv->ampdu_enable == false) && (pregistrypriv->ampdu_enable ==1 )) { +if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable ==1 ) {
Same.
drivers/staging/rtl8723bs/core/rtw_mlme.c void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe · line 2820
Quoted 3 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +0
-0if (pregistrypriv->wifi_spec ==1 ) {/* remove this part because testbed AP should disable RX AMPDU */ /* phtpriv->ampdu_enable = false; */
regards,
dan carpenter
PATCH 4/4 staging: rtl8723bs: Remove unnecessary blank lines
In reply to Wambui KarugaRemove multiple blank lines indrivers/staging/rtl8723bs/core/rtw_mlme.c.
Issues reported by checkpatch.pl as:
CHECK: Please don't use multiple blank lines
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 47 ----------------------- 1 file changed, 47 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +0 -47
@@ -208,7 +208,6 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwor pmlmepriv->num_of_scanned--; -/* DBG_871X("_rtw_free_network:SSID =%s\n", pnetwork->network.Ssid.Ssid); */ spin_unlock_bh (&free_queue->lock);
@@ -300,12 +299,8 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)spin_unlock_bh (&scanned_queue->lock); } - - -sint rtw_if_up (struct adapter *padapter) { -sint res; if (padapter->bDriverStopped || padapter->bSurpriseRemoved ||
@@ -317,7 +312,6 @@ sint rtw_if_up(struct adapter *padapter)return res; } -void rtw_generate_random_ibss (u8 *pibss) {unsigned long curtime = jiffies;
@@ -335,7 +329,6 @@ u8 *rtw_get_capability_from_ie(u8 *ie)return ie +8 +2 ; } -u16 rtw_get_capability (struct wlan_bssid_ex *bss) {__le16 val;
@@ -423,7 +416,6 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 feamemcpy ((u8 *)&tmps,rtw_get_capability_from_ie (src->IEs),2 );memcpy ((u8 *)&tmpd,rtw_get_capability_from_ie (dst->IEs),2 ); - s_cap =le16_to_cpu (tmps); d_cap =le16_to_cpu (tmpd);
@@ -465,7 +457,6 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue) {struct list_head *plist, *phead; -struct wlan_network *pwlan =NULL ;struct wlan_network *oldest =NULL ;
@@ -577,12 +568,8 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex } } -/* -Caller must hold pmlmepriv->lock first. - -*/ void rtw_update_scanned_network (struct adapter *adapter,struct wlan_bssid_ex *target) {
@@ -623,7 +610,6 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t } -/* If we didn't find a match, then get a new network slot to initialize * with this beacon's information */ /* if (phead == plist) { */
@@ -759,7 +745,6 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor } } -if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy ==0 )) {DBG_871X ("desired_encmode: %d, privacy: %d\n" , desired_encmode, privacy); bselected = false;
@@ -770,7 +755,6 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor bselected = false; } -return bselected; }
@@ -780,7 +764,6 @@ void rtw_atimdone_event_callback(struct adapter *adapter, u8 *pbuf)RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("receive atimdone_event\n" )); } -void rtw_survey_event_callback (struct adapter *adapter,u8 *pbuf) {u32 len;
@@ -797,7 +780,6 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)return ; } -spin_lock_bh (&pmlmepriv->lock);/* update IBSS_network 's timestamp */
@@ -830,8 +812,6 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)spin_unlock_bh (&pmlmepriv->lock); } - -void rtw_surveydone_event_callback (struct adapter *adapter,u8 *pbuf) {u8 timer_cancelled = false;
@@ -862,7 +842,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)if (timer_cancelled)_cancel_timer (&pmlmepriv->scan_to_timer, &timer_cancelled); -spin_lock_bh (&pmlmepriv->lock);rtw_set_signal_stat_timer (&adapter->recvpriv);
@@ -1002,7 +981,6 @@ static void find_network(struct adapter *adapter)else RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_assoc_resources : pwlan == NULL\n\n" )); -if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) && (adapter->stapriv.asoc_sta_count ==1 ))rtw_free_network_nolock (adapter, pwlan);
@@ -1181,7 +1159,6 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str psta->wireless_mode = pmlmeext->cur_wireless_mode; psta->raid =networktype_to_raid_ex (padapter, psta); -/* sta mode */ rtw_hal_set_odm_var (padapter,HAL_ODM_STA_INFO , psta, true);
@@ -1213,7 +1190,6 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str padapter->securitypriv.wps_ie_len =0 ; } -/* 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 */ /* todo: check if AP can send A-MPDU packets */
@@ -1230,7 +1206,6 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str preorder_ctrl->wsize_b =64 ;/* max_ampdu_sz;ex. 32(kbytes) -> wsize_b =32 */ } - bmc_sta =rtw_get_bcmc_stainfo (padapter);if (bmc_sta) {for (i =0 ; i <16 ; i++) {
@@ -1264,7 +1239,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netRT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\nfw_state:%x, BSSID:" MAC_FMT "\n" ,get_fwstate (pmlmepriv),MAC_ARG (pnetwork->network.MacAddress))); -/* why not use ptarget_wlan?? */ memcpy (&cur_network->network, &pnetwork->network, pnetwork->network.Length);/* some IEs in pnetwork is wrong, so we should use ptarget_wlan IEs */
@@ -1273,7 +1247,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net cur_network->aid = pnetwork->join_res; -rtw_set_signal_stat_timer (&padapter->recvpriv); padapter->recvpriv.signal_strength = ptarget_wlan->network.PhyInfo.SignalStrength;
@@ -1341,7 +1314,6 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)rtw_get_encrypt_decrypt_from_registrypriv (adapter); -if (pmlmepriv->assoc_ssid.SsidLength ==0 )RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("@@@@@ joinbss event call back for Any SSid\n" ));else
@@ -1403,7 +1375,6 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) goto ignore_joinbss_callback; } -/* s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode */ if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { ptarget_sta =rtw_joinbss_update_stainfo (adapter, pnetwork);
@@ -1423,7 +1394,6 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("adhoc mode, fw_state:%x" ,get_fwstate (pmlmepriv))); } -/* s5. Cancel assoc_timer */ _cancel_timer (&pmlmepriv->assoc_timer, &timer_cancelled);
@@ -1582,7 +1552,6 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm; - psta->ieee8021x_blocked = false;spin_lock_bh (&pmlmepriv->lock);
@@ -1603,7 +1572,6 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)spin_unlock_bh (&pmlmepriv->lock); -mlmeext_sta_add_event_callback (adapter, psta); }
@@ -1639,7 +1607,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE )return ; -mlmeext_sta_del_event_callback (adapter);spin_lock_bh (&pmlmepriv->lock);
@@ -1736,7 +1703,6 @@ void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf)cpwm_int_hdl (padapter, preportpwrstate); } -void rtw_wmm_event_callback (struct adapter *padapter,u8 *pbuf) {WMMOnAssocRsp (padapter);
@@ -1899,7 +1865,6 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)rtw_auto_scan_handler (adapter); } -inline bool rtw_is_scan_deny (struct adapter *adapter) {struct mlme_priv *mlmepriv = &adapter->mlmepriv;
@@ -2045,7 +2010,6 @@ static int rtw_check_join_candidate(struct mlme_priv *mlmeint updated = false; struct adapter *adapter = container_of(mlme, struct adapter, mlmepriv); -/* check bssid, if needed */ if (mlme->assoc_by_bssid) {if (memcmp (competitor->network.MacAddress, mlme->assoc_bssid,ETH_ALEN ))
@@ -2096,12 +2060,8 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme/* Calling context: The caller of the sub-routine will be in critical section... -The caller must hold the following spinlock -pmlmepriv->lock - -*/ int rtw_select_and_join_from_scanned_queue (struct mlme_priv *pmlmepriv)
@@ -2208,7 +2168,6 @@ sint rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv) pcmd->rsp =NULL ; pcmd->rspsz =0 ; -INIT_LIST_HEAD (&pcmd->list);RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("after enqueue set_auth_cmd, auth_mode =%x\n" , psecuritypriv->dot11AuthAlgrthm));
@@ -2276,7 +2235,6 @@ sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, s goto exit; } -if (enqueue) { pcmd =rtw_zmalloc (sizeof (struct cmd_obj ));if (!pcmd) {
@@ -2331,7 +2289,6 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_ } -/* */ /* Ported from 8185: IsInPreAuthKeyList(). (Renamed from SecIsInPreAuthKeyList(), 2006-10-13.) */ /* Added by Annie, 2006-05-07. */
@@ -2827,7 +2784,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe/* phtpriv->ampdu_enable = true; */ } -/* check Max Rx A-MPDU Size */ len =0 ; p =rtw_get_ie (pie+sizeof (struct ndis_802_11_fix_ie ), _HT_CAPABILITY_IE_, &len, ie_len-sizeof (struct ndis_802_11_fix_ie ));
@@ -2841,7 +2797,6 @@ 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 ), _HT_ADD_INFO_IE_, &len, ie_len-sizeof (struct ndis_802_11_fix_ie ));if (p && len >0 ) {
@@ -2951,7 +2906,6 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfrreturn ; } - phtpriv = &psta->htpriv;if (phtpriv->ht_option && phtpriv->ampdu_enable) {
@@ -2974,7 +2928,6 @@ void rtw_append_exented_cap(struct adapter *padapter, u8 *out_ie, uint *pout_lenu8 cap_content[8 ] = {0 };u8 *pframe; -if (phtpriv->bss_coexist)SET_EXT_CAPABILITY_ELE_BSS_COEXIST (cap_content,1 );
Signature · 1 line
2.23.0