Commit af6afdb6 authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: split long lines 



fix following post-commit checkpatch hooks:

WARNING: line length of 110 exceeds 100 columns
266: FILE: drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:623:
+			pmlmepriv->cur_network.join_res) || check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
--
WARNING: line length of 102 exceeds 100 columns
468: FILE: drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:5234:
+				if (tx_chk != _SUCCESS && pmlmeinfo->link_count++ == link_count_limit)
--
WARNING: line length of 124 exceeds 100 columns
543: FILE: drivers/staging/rtl8723bs/core/rtw_pwrctrl.c:335:
+	if ((padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && !(padapter->securitypriv.binstallGrpkey))
--
WARNING: line length of 112 exceeds 100 columns
828: FILE: drivers/staging/rtl8723bs/core/rtw_wlan_util.c:1061:
+		if (TEST_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_TX) && GET_HT_CAPABILITY_ELE_TX_STBC(pIE->data))
--
WARNING: line length of 113 exceeds 100 columns
836: FILE: drivers/staging/rtl8723bs/core/rtw_wlan_util.c:1067:
+		if (TEST_FLAG(phtpriv->ldpc_cap, LDPC_HT_ENABLE_TX) && GET_HT_CAPABILITY_ELE_LDPC_CAP(pIE->data))
--
WARNING: line length of 112 exceeds 100 columns
844: FILE: drivers/staging/rtl8723bs/core/rtw_wlan_util.c:1073:
+		if (TEST_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_TX) && GET_HT_CAPABILITY_ELE_RX_STBC(pIE->data))
--
WARNING: line length of 125 exceeds 100 columns
883: FILE: drivers/staging/rtl8723bs/core/rtw_wlan_util.c:1282:
+		rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, WLAN_EID_HT_OPERATION, &len, bssid->IELength - _FIXED_IE_LENGTH_);
--
WARNING: line length of 101 exceeds 100 columns
904: FILE: drivers/staging/rtl8723bs/core/rtw_wlan_util.c:1305:
+		if (bssid->Ssid.Ssid[0] != '\0' && bssid->Ssid.SsidLength != 0) /* not hidden ssid */
--
WARNING: line length of 129 exceeds 100 columns
953: FILE: drivers/staging/rtl8723bs/core/rtw_wlan_util.c:1345:
+		if (pairwise_cipher != cur_network->BcnInfo.pairwise_cipher || group_cipher != cur_network->BcnInfo.group_cipher)
--
WARNING: line length of 113 exceeds 100 columns
1712: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_linux.c:2651:

Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/814139162ef516bb07bb50876578b032573271ac.1617802415.git.fabioaiuto83@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e338f5f0

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+5 −3
Original line number Diff line number Diff line
@@ -620,7 +620,8 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame) 


_issue_probersp:

		if ((check_fwstate(pmlmepriv, _FW_LINKED) &&

			pmlmepriv->cur_network.join_res) || check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))

		     pmlmepriv->cur_network.join_res) ||

		     check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))

			issue_probersp(padapter, get_sa(pframe), is_valid_p2p_probereq);

	}
@@ -5231,7 +5232,8 @@ void linked_status_chk(struct adapter *padapter) 
					}

				}



				if (tx_chk != _SUCCESS && pmlmeinfo->link_count++ == link_count_limit)

				if (tx_chk != _SUCCESS &&

				    pmlmeinfo->link_count++ == link_count_limit)

					tx_chk = issue_nulldata_in_interrupt(padapter, NULL);

			}

drivers/staging/rtl8723bs/core/rtw_pwrctrl.c

+2 −1
Original line number Diff line number Diff line
@@ -332,7 +332,8 @@ static u8 PS_RDY_CHECK(struct adapter *padapter) 
	)

		return false;



	if ((padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && !(padapter->securitypriv.binstallGrpkey))

	if ((padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) &&

	    !(padapter->securitypriv.binstallGrpkey))

		return false;



	if (!rtw_cfg80211_pwr_mgmt(padapter))

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+12 −6
Original line number Diff line number Diff line
@@ -1058,19 +1058,22 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE) 


	if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {

		/*  Config STBC setting */

		if (TEST_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_TX) && GET_HT_CAPABILITY_ELE_TX_STBC(pIE->data))

		if (TEST_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_TX) &&

		    GET_HT_CAPABILITY_ELE_TX_STBC(pIE->data))

			SET_FLAG(cur_stbc_cap, STBC_HT_ENABLE_TX);



		phtpriv->stbc_cap = cur_stbc_cap;

	} else {

		/*  Config LDPC Coding Capability */

		if (TEST_FLAG(phtpriv->ldpc_cap, LDPC_HT_ENABLE_TX) && GET_HT_CAPABILITY_ELE_LDPC_CAP(pIE->data))

		if (TEST_FLAG(phtpriv->ldpc_cap, LDPC_HT_ENABLE_TX) &&

		    GET_HT_CAPABILITY_ELE_LDPC_CAP(pIE->data))

			SET_FLAG(cur_ldpc_cap, (LDPC_HT_ENABLE_TX | LDPC_HT_CAP_TX));



		phtpriv->ldpc_cap = cur_ldpc_cap;



		/*  Config STBC setting */

		if (TEST_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_TX) && GET_HT_CAPABILITY_ELE_RX_STBC(pIE->data))

		if (TEST_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_TX) &&

		    GET_HT_CAPABILITY_ELE_RX_STBC(pIE->data))

			SET_FLAG(cur_stbc_cap, (STBC_HT_ENABLE_TX | STBC_HT_CAP_TX));



		phtpriv->stbc_cap = cur_stbc_cap;
@@ -1279,7 +1282,8 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
	if (p) {

			bcn_channel = *(p + 2);

	} else {/* In 5G, some ap do not have DSSET IE checking HT info for channel */

		rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, WLAN_EID_HT_OPERATION, &len, bssid->IELength - _FIXED_IE_LENGTH_);

		rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, WLAN_EID_HT_OPERATION,

			   &len, bssid->IELength - _FIXED_IE_LENGTH_);

		if (pht_info)

			bcn_channel = pht_info->primary_channel;

		else /* we don't find channel IE, so don't check it */
@@ -1302,7 +1306,8 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 


	if (memcmp(bssid->Ssid.Ssid, cur_network->network.Ssid.Ssid, 32) ||

			bssid->Ssid.SsidLength != cur_network->network.Ssid.SsidLength)

		if (bssid->Ssid.Ssid[0] != '\0' && bssid->Ssid.SsidLength != 0) /* not hidden ssid */

		if (bssid->Ssid.Ssid[0] != '\0' &&

		    bssid->Ssid.SsidLength != 0) /* not hidden ssid */

			goto _mismatch;



	/* check encryption info */
@@ -1342,7 +1347,8 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
						  &pairwise_cipher, &is_8021x);

		}



		if (pairwise_cipher != cur_network->BcnInfo.pairwise_cipher || group_cipher != cur_network->BcnInfo.group_cipher)

		if (pairwise_cipher != cur_network->BcnInfo.pairwise_cipher ||

		    group_cipher != cur_network->BcnInfo.group_cipher)

			goto _mismatch;



		if (is_8021x != cur_network->BcnInfo.is_8021x)

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

+2 −1
Original line number Diff line number Diff line
@@ -2648,7 +2648,8 @@ static int rtw_dbg_port(struct net_device *dev, 
					struct registry_priv *pregpriv = &padapter->registrypriv;

					/*  0: disable, bit(0):enable 2.4g, bit(1):enable 5g, 0x3: enable both 2.4g and 5g */

					/* default is set to enable 2.4GHZ for IOT issue with bufflao's AP at 5GHZ */

					if (extra_arg == 0 || extra_arg == 1 || extra_arg == 2 || extra_arg == 3)

					if (extra_arg == 0 || extra_arg == 1 ||

					    extra_arg == 2 || extra_arg == 3)

						pregpriv->rx_stbc = extra_arg;

				}

				break;