Skip to contentSkip to conversation

staging: rtl8723bs: fix logical continuation style

PATCH In review Feiyu Wang 3 participants 4 messages Oct 7 – Oct 17 Staging

lore
Share & tools
lore

Feiyu Wang

author
#0 lore raw

PATCH 1/1 staging: rtl8723bs: fix logical continuation style

Move logical operators to the end of the previous line to follow the kernel coding style, as reported by checkpatch.pl.

---
 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +9 -9
index a715ac6aa6b9..5dfbb8d9f6ed 100644
@@ -393,8 +393,8 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
 	struct wlan_network  *cur_network = &pmlmepriv->cur_network;
 	struct wireless_dev *pwdev = padapter->rtw_wdev;
 
-	if (pwdev->iftype != NL80211_IFTYPE_STATION
-		&& pwdev->iftype != NL80211_IFTYPE_P2P_CLIENT
+	if (pwdev->iftype != NL80211_IFTYPE_STATION &&
+	    pwdev->iftype != NL80211_IFTYPE_P2P_CLIENT
 	) {
 		return;
 	}
@@ -462,8 +462,8 @@ void rtw_cfg80211_indicate_disconnect(struct adapter *padapter)
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 	struct wireless_dev *pwdev = padapter->rtw_wdev;
 
-	if (pwdev->iftype != NL80211_IFTYPE_STATION
-		&& pwdev->iftype != NL80211_IFTYPE_P2P_CLIENT
+	if (pwdev->iftype != NL80211_IFTYPE_STATION &&
+	    pwdev->iftype != NL80211_IFTYPE_P2P_CLIENT
 	) {
 		return;
 	}
@@ -971,8 +971,8 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
 	}
 
 	/* for infra./P2PClient mode */
-	if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
-		&& check_fwstate(pmlmepriv, _FW_LINKED)) {
+	if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) &&
+	    check_fwstate(pmlmepriv, _FW_LINKED)) {
 		struct wlan_network  *cur_network = &pmlmepriv->cur_network;
 
 		if (memcmp((u8 *)mac, cur_network->network.mac_address, ETH_ALEN)) {
@@ -1507,9 +1507,9 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel
 	}
 
 	/* TKIP and AES disallow multicast packets until installing group key */
-	if (padapter->securitypriv.dot11_privacy_algrthm == _TKIP_
-		|| padapter->securitypriv.dot11_privacy_algrthm == _TKIP_WTMIC_
-		|| padapter->securitypriv.dot11_privacy_algrthm == _AES_)
+	if (padapter->securitypriv.dot11_privacy_algrthm == _TKIP_ ||
+	    padapter->securitypriv.dot11_privacy_algrthm == _TKIP_WTMIC_ ||
+	    padapter->securitypriv.dot11_privacy_algrthm == _AES_)
 		/* WPS open need to enable multicast */
 		/*  check_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS) == true) */
 		rtw_hal_set_hwreg(padapter, HW_VAR_OFF_RCR_AM, null_addr);
Signature · 1 line
2.55.0
author
#1 lore raw

Hi Greg,

A gentle ping on this patch. Please let me know if there is anything that needs to be changed.

Thanks,
Feiyu

maintainer
#2 lore raw
Quoted 4 lines · Feiyu Wang

Hi Greg,

A gentle ping on this patch. Please let me know if there is anything that needs to be changed.

I have no context here.

#3 lore raw
In reply to Feiyu Wang
Quoted 5 lines · Feiyu Wang

Hi Greg,

A gentle ping on this patch. Please let me know if there is anything that needs to be changed.

The driver was deleted and no longer exists in linux-next.

regards,
dan carpenter