staging: rtl8723bs: fix Alignment should match open parenthesis in rtw_mlme.c
PATCH 1/1 staging: rtl8723bs: fix Alignment should match open parenthesis in rtw_mlme.c
Align continuation lines which weren't properly aligned.
Signed-off-by Dalvin-Ehinoma Noah Aiguobas <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +7 -7
@@ -265,7 +265,7 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)bool rtw_if_up (struct adapter *padapter) {if (padapter->bDriverStopped || padapter->bSurpriseRemoved || - !check_fwstate (&padapter->mlmepriv, _FW_LINKED)) + !check_fwstate (&padapter->mlmepriv, _FW_LINKED))return false;return true;
@@ -331,7 +331,7 @@ bool rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork)struct security_priv *psecuritypriv = &adapter->securitypriv;if ((psecuritypriv->dot11PrivacyAlgrthm != _NO_PRIVACY_) && - (pnetwork->network.privacy ==0 )) + (pnetwork->network.privacy ==0 ))return false;else if ((psecuritypriv->dot11PrivacyAlgrthm == _NO_PRIVACY_) && (pnetwork->network.privacy ==1 ))
@@ -406,7 +406,7 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue) }void update_network (struct wlan_bssid_ex *dst,struct wlan_bssid_ex *src, -struct adapter *padapter,bool update_ie) +struct adapter *padapter,bool update_ie) {long rssi_ori = dst->rssi;
@@ -457,7 +457,7 @@ 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);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); } }
@@ -1064,7 +1064,7 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net }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));rtw_update_ht_cap (padapter, cur_network->network.ies, cur_network->network.ie_length, (u8 ) cur_network->network.configuration.ds_config); }
@@ -1432,7 +1432,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) }if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) || -check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) { +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) */
@@ -1991,7 +1991,7 @@ static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid)for (i =0 ; i <NUM_PMKID_CACHE ; i++)if ((p->PMKIDList[i].bUsed) && - (!memcmp (p->PMKIDList[i].Bssid, bssid,ETH_ALEN ))) + (!memcmp (p->PMKIDList[i].Bssid, bssid,ETH_ALEN )))return i;return -1 ; }
Signature · 1 line
2.54.0
PATCH v3 1/1 staging: rtl8723bs: Fix logical operator alignment in rtw_mlme.c
Move logical operators to the end of continuation lines and adjust indentation in rtw_mlme.c to comply with the Linux kernel coding style.
Signed-off-by Dalvin-Ehinoma Noah Aiguobas <[email protected]>
---
Change v3:
- Rebased against current origin/staging-testing
- Changed subject and patch description
- Correcting changelog from v2
drivers/staging/rtl8723bs/core/rtw_mlme.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +11 -12
@@ -342,8 +342,8 @@ bool rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork)inline int is_same_ess (struct wlan_bssid_ex *a,struct wlan_bssid_ex *b) { -return (a->ssid.ssid_length == b->ssid.ssid_length) - && !memcmp (a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length); +return (a->ssid.ssid_length == b->ssid.ssid_length) && + !memcmp (a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length); }int is_same_network (struct wlan_bssid_ex *src,struct wlan_bssid_ex *dst,u8 feature)
@@ -755,8 +755,8 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) } }else {if (rtw_chk_roam_flags (adapter,RTW_ROAM_ACTIVE )) { -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) - &&check_fwstate (pmlmepriv, _FW_LINKED)) { +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 );
@@ -928,8 +928,7 @@ void rtw_scan_abort(struct adapter *adapter) start = jiffies; pmlmeext->scan_abort = true; -while (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) - &&jiffies_to_msecs (start) <=200 ) { +while (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) &&jiffies_to_msecs (start) <=200 ) {if (adapter->bDriverStopped || adapter->bSurpriseRemoved)break ;
@@ -1578,8 +1577,8 @@ static void rtw_auto_scan_handler(struct adapter *padapter)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) { +if (pmlmepriv->auto_scan_int_ms !=0 && +jiffies_to_msecs (jiffies - pmlmepriv->scan_start_time) > pmlmepriv->auto_scan_int_ms) {if (!padapter->registrypriv.wifi_spec) {if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) goto exit;
@@ -1609,8 +1608,8 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)if (adapter->net_closed)return ; -if ((adapter_to_pwrctl (adapter)->fw_current_in_ps_mode) - && !(hal_btcoex_IsBtControlLps (adapter)) +if ((adapter_to_pwrctl (adapter)->fw_current_in_ps_mode) && + !(hal_btcoex_IsBtControlLps (adapter)) ) {bool should_enter_ps;
@@ -1754,8 +1753,8 @@ 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) +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) ) goto exit; }
Signature · 1 line
2.54.0