Commit b68e5a50 authored by Alaa Mohamed's avatar Alaa Mohamed Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: Fix multiple line dereference 



Reported by checkpatch:

WARNING: Avoid multiple line dereference

Signed-off-by: default avatarAlaa Mohamed <eng.alaamohamedsoliman.am@gmail.com>
Link: https://lore.kernel.org/r/20220404210010.9795-1-eng.alaamohamedsoliman.am@gmail.com


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

drivers/staging/rtl8712/rtl871x_mlme.c

+25 −52
Original line number Diff line number Diff line
@@ -431,8 +431,7 @@ static int is_desired_network(struct _adapter *adapter, 
		bselected = false;

	if (check_fwstate(&adapter->mlmepriv, WIFI_ADHOC_STATE)) {

		if (pnetwork->network.InfrastructureMode !=

			adapter->mlmepriv.cur_network.network.

			InfrastructureMode)

			adapter->mlmepriv.cur_network.network.InfrastructureMode)

			bselected = false;

	}

	return bselected;
@@ -539,8 +538,7 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf) 
					struct wlan_bssid_ex *pdev_network =

					  &(adapter->registrypriv.dev_network);

					u8 *pibss =

						 adapter->registrypriv.

							dev_network.MacAddress;

						 adapter->registrypriv.dev_network.MacAddress;

					pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;

					memcpy(&pdev_network->Ssid,

						&pmlmepriv->assoc_ssid,
@@ -688,11 +686,9 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf) 
	pnetwork->network.Configuration.DSConfig =

		 le32_to_cpu(pnetwork->network.Configuration.DSConfig);

	pnetwork->network.Configuration.FHConfig.DwellTime =

		 le32_to_cpu(pnetwork->network.Configuration.FHConfig.

			     DwellTime);

		 le32_to_cpu(pnetwork->network.Configuration.FHConfig.DwellTime);

	pnetwork->network.Configuration.FHConfig.HopPattern =

		 le32_to_cpu(pnetwork->network.Configuration.

			     FHConfig.HopPattern);

		 le32_to_cpu(pnetwork->network.Configuration.FHConfig.HopPattern);

	pnetwork->network.Configuration.FHConfig.HopSet =

		 le32_to_cpu(pnetwork->network.Configuration.FHConfig.HopSet);

	pnetwork->network.Configuration.FHConfig.Length =
@@ -717,36 +713,29 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf) 
			if (check_fwstate(pmlmepriv, _FW_LINKED)) {

				if (the_same_macaddr) {

					ptarget_wlan =

					    r8712_find_network(&pmlmepriv->

					    scanned_queue,

					    r8712_find_network(&pmlmepriv->scanned_queue,

					    cur_network->network.MacAddress);

				} else {

					pcur_wlan =

					     r8712_find_network(&pmlmepriv->

					     scanned_queue,

					     r8712_find_network(&pmlmepriv->scanned_queue,

					     cur_network->network.MacAddress);

					if (pcur_wlan)

						pcur_wlan->fixed = false;



					pcur_sta = r8712_get_stainfo(pstapriv,

					     cur_network->network.MacAddress);

					spin_lock_irqsave(&pstapriv->

						sta_hash_lock, irqL2);

					spin_lock_irqsave(&pstapriv->sta_hash_lock, irqL2);

					r8712_free_stainfo(adapter, pcur_sta);

					spin_unlock_irqrestore(&(pstapriv->

						sta_hash_lock), irqL2);

					spin_unlock_irqrestore(&(pstapriv->sta_hash_lock), irqL2);



					ptarget_wlan =

						 r8712_find_network(&pmlmepriv->

						 scanned_queue,

						 pnetwork->network.

						 MacAddress);

						 r8712_find_network(&pmlmepriv->scanned_queue,

						 pnetwork->network.MacAddress);

					if (ptarget_wlan)

						ptarget_wlan->fixed = true;

				}

			} else {

				ptarget_wlan = r8712_find_network(&pmlmepriv->

						scanned_queue,

				ptarget_wlan = r8712_find_network(&pmlmepriv->scanned_queue,

						pnetwork->network.MacAddress);

				if (ptarget_wlan)

					ptarget_wlan->fixed = true;
@@ -779,39 +768,25 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf) 
					ptarget_sta->aid = pnetwork->join_res;

					ptarget_sta->qos_option = 1;

					ptarget_sta->mac_id = 5;

					if (adapter->securitypriv.

					    AuthAlgrthm == 2) {

						adapter->securitypriv.

							binstallGrpkey =

							 false;

						adapter->securitypriv.

							busetkipkey =

							 false;

						adapter->securitypriv.

							bgrpkey_handshake =

							 false;

						ptarget_sta->ieee8021x_blocked

							 = true;

						ptarget_sta->XPrivacy =

							 adapter->securitypriv.

							 PrivacyAlgrthm;

						memset((u8 *)&ptarget_sta->

							 x_UncstKey,

					if (adapter->securitypriv.AuthAlgrthm == 2) {

						adapter->securitypriv.binstallGrpkey = false;

						adapter->securitypriv.busetkipkey = false;

						adapter->securitypriv.bgrpkey_handshake = false;

						ptarget_sta->ieee8021x_blocked = true;

						ptarget_sta->XPrivacy = adapter->

						securitypriv.PrivacyAlgrthm;

						memset((u8 *)&ptarget_sta->x_UncstKey,

							 0,

							 sizeof(union Keytype));

						memset((u8 *)&ptarget_sta->

							 tkiprxmickey,

						memset((u8 *)&ptarget_sta->tkiprxmickey,

							 0,

							 sizeof(union Keytype));

						memset((u8 *)&ptarget_sta->

							 tkiptxmickey,

						memset((u8 *)&ptarget_sta->tkiptxmickey,

							 0,

							 sizeof(union Keytype));

						memset((u8 *)&ptarget_sta->

							 txpn, 0,

						memset((u8 *)&ptarget_sta->txpn, 0,

							 sizeof(union pn48));

						memset((u8 *)&ptarget_sta->

							 rxpn, 0,

						memset((u8 *)&ptarget_sta->rxpn, 0,

							 sizeof(union pn48));

					}

				} else {
@@ -942,8 +917,7 @@ void r8712_stadel_event_callback(struct _adapter *adapter, u8 *pbuf) 
			pdev_network = &(adapter->registrypriv.dev_network);

			pibss = adapter->registrypriv.dev_network.MacAddress;

			memcpy(pdev_network, &tgt_network->network,

				r8712_get_wlan_bssid_ex_sz(&tgt_network->

							network));

				r8712_get_wlan_bssid_ex_sz(&tgt_network->network));

			memcpy(&pdev_network->Ssid,

				&pmlmepriv->assoc_ssid,

				sizeof(struct ndis_802_11_ssid));
@@ -1092,8 +1066,7 @@ int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv) 
			src_ssid = pmlmepriv->assoc_bssid;

			if (!memcmp(dst_ssid, src_ssid, ETH_ALEN)) {

				if (check_fwstate(pmlmepriv, _FW_LINKED)) {

					if (is_same_network(&pmlmepriv->

					    cur_network.network,

					if (is_same_network(&pmlmepriv->cur_network.network,

					    &pnetwork->network)) {

						_clr_fwstate_(pmlmepriv,

							_FW_UNDER_LINKING);