提交 b68e5a50 编写于 作者: A Alaa Mohamed 提交者: Greg Kroah-Hartman

staging: rtl8712: Fix multiple line dereference

Reported by checkpatch:

WARNING: Avoid multiple line dereference
Signed-off-by: NAlaa Mohamed <eng.alaamohamedsoliman.am@gmail.com>
Link: https://lore.kernel.org/r/20220404210010.9795-1-eng.alaamohamedsoliman.am@gmail.comSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 981ef869
...@@ -431,8 +431,7 @@ static int is_desired_network(struct _adapter *adapter, ...@@ -431,8 +431,7 @@ static int is_desired_network(struct _adapter *adapter,
bselected = false; bselected = false;
if (check_fwstate(&adapter->mlmepriv, WIFI_ADHOC_STATE)) { if (check_fwstate(&adapter->mlmepriv, WIFI_ADHOC_STATE)) {
if (pnetwork->network.InfrastructureMode != if (pnetwork->network.InfrastructureMode !=
adapter->mlmepriv.cur_network.network. adapter->mlmepriv.cur_network.network.InfrastructureMode)
InfrastructureMode)
bselected = false; bselected = false;
} }
return bselected; return bselected;
...@@ -539,8 +538,7 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf) ...@@ -539,8 +538,7 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf)
struct wlan_bssid_ex *pdev_network = struct wlan_bssid_ex *pdev_network =
&(adapter->registrypriv.dev_network); &(adapter->registrypriv.dev_network);
u8 *pibss = u8 *pibss =
adapter->registrypriv. adapter->registrypriv.dev_network.MacAddress;
dev_network.MacAddress;
pmlmepriv->fw_state ^= _FW_UNDER_SURVEY; pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;
memcpy(&pdev_network->Ssid, memcpy(&pdev_network->Ssid,
&pmlmepriv->assoc_ssid, &pmlmepriv->assoc_ssid,
...@@ -688,11 +686,9 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf) ...@@ -688,11 +686,9 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf)
pnetwork->network.Configuration.DSConfig = pnetwork->network.Configuration.DSConfig =
le32_to_cpu(pnetwork->network.Configuration.DSConfig); le32_to_cpu(pnetwork->network.Configuration.DSConfig);
pnetwork->network.Configuration.FHConfig.DwellTime = pnetwork->network.Configuration.FHConfig.DwellTime =
le32_to_cpu(pnetwork->network.Configuration.FHConfig. le32_to_cpu(pnetwork->network.Configuration.FHConfig.DwellTime);
DwellTime);
pnetwork->network.Configuration.FHConfig.HopPattern = pnetwork->network.Configuration.FHConfig.HopPattern =
le32_to_cpu(pnetwork->network.Configuration. le32_to_cpu(pnetwork->network.Configuration.FHConfig.HopPattern);
FHConfig.HopPattern);
pnetwork->network.Configuration.FHConfig.HopSet = pnetwork->network.Configuration.FHConfig.HopSet =
le32_to_cpu(pnetwork->network.Configuration.FHConfig.HopSet); le32_to_cpu(pnetwork->network.Configuration.FHConfig.HopSet);
pnetwork->network.Configuration.FHConfig.Length = pnetwork->network.Configuration.FHConfig.Length =
...@@ -717,36 +713,29 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf) ...@@ -717,36 +713,29 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf)
if (check_fwstate(pmlmepriv, _FW_LINKED)) { if (check_fwstate(pmlmepriv, _FW_LINKED)) {
if (the_same_macaddr) { if (the_same_macaddr) {
ptarget_wlan = ptarget_wlan =
r8712_find_network(&pmlmepriv-> r8712_find_network(&pmlmepriv->scanned_queue,
scanned_queue,
cur_network->network.MacAddress); cur_network->network.MacAddress);
} else { } else {
pcur_wlan = pcur_wlan =
r8712_find_network(&pmlmepriv-> r8712_find_network(&pmlmepriv->scanned_queue,
scanned_queue,
cur_network->network.MacAddress); cur_network->network.MacAddress);
if (pcur_wlan) if (pcur_wlan)
pcur_wlan->fixed = false; pcur_wlan->fixed = false;
pcur_sta = r8712_get_stainfo(pstapriv, pcur_sta = r8712_get_stainfo(pstapriv,
cur_network->network.MacAddress); cur_network->network.MacAddress);
spin_lock_irqsave(&pstapriv-> spin_lock_irqsave(&pstapriv->sta_hash_lock, irqL2);
sta_hash_lock, irqL2);
r8712_free_stainfo(adapter, pcur_sta); r8712_free_stainfo(adapter, pcur_sta);
spin_unlock_irqrestore(&(pstapriv-> spin_unlock_irqrestore(&(pstapriv->sta_hash_lock), irqL2);
sta_hash_lock), irqL2);
ptarget_wlan = ptarget_wlan =
r8712_find_network(&pmlmepriv-> r8712_find_network(&pmlmepriv->scanned_queue,
scanned_queue, pnetwork->network.MacAddress);
pnetwork->network.
MacAddress);
if (ptarget_wlan) if (ptarget_wlan)
ptarget_wlan->fixed = true; ptarget_wlan->fixed = true;
} }
} else { } else {
ptarget_wlan = r8712_find_network(&pmlmepriv-> ptarget_wlan = r8712_find_network(&pmlmepriv->scanned_queue,
scanned_queue,
pnetwork->network.MacAddress); pnetwork->network.MacAddress);
if (ptarget_wlan) if (ptarget_wlan)
ptarget_wlan->fixed = true; ptarget_wlan->fixed = true;
...@@ -779,39 +768,25 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf) ...@@ -779,39 +768,25 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf)
ptarget_sta->aid = pnetwork->join_res; ptarget_sta->aid = pnetwork->join_res;
ptarget_sta->qos_option = 1; ptarget_sta->qos_option = 1;
ptarget_sta->mac_id = 5; ptarget_sta->mac_id = 5;
if (adapter->securitypriv. if (adapter->securitypriv.AuthAlgrthm == 2) {
AuthAlgrthm == 2) { adapter->securitypriv.binstallGrpkey = false;
adapter->securitypriv. adapter->securitypriv.busetkipkey = false;
binstallGrpkey = adapter->securitypriv.bgrpkey_handshake = false;
false; ptarget_sta->ieee8021x_blocked = true;
adapter->securitypriv. ptarget_sta->XPrivacy = adapter->
busetkipkey = securitypriv.PrivacyAlgrthm;
false; memset((u8 *)&ptarget_sta->x_UncstKey,
adapter->securitypriv.
bgrpkey_handshake =
false;
ptarget_sta->ieee8021x_blocked
= true;
ptarget_sta->XPrivacy =
adapter->securitypriv.
PrivacyAlgrthm;
memset((u8 *)&ptarget_sta->
x_UncstKey,
0, 0,
sizeof(union Keytype)); sizeof(union Keytype));
memset((u8 *)&ptarget_sta-> memset((u8 *)&ptarget_sta->tkiprxmickey,
tkiprxmickey,
0, 0,
sizeof(union Keytype)); sizeof(union Keytype));
memset((u8 *)&ptarget_sta-> memset((u8 *)&ptarget_sta->tkiptxmickey,
tkiptxmickey,
0, 0,
sizeof(union Keytype)); sizeof(union Keytype));
memset((u8 *)&ptarget_sta-> memset((u8 *)&ptarget_sta->txpn, 0,
txpn, 0,
sizeof(union pn48)); sizeof(union pn48));
memset((u8 *)&ptarget_sta-> memset((u8 *)&ptarget_sta->rxpn, 0,
rxpn, 0,
sizeof(union pn48)); sizeof(union pn48));
} }
} else { } else {
...@@ -942,8 +917,7 @@ void r8712_stadel_event_callback(struct _adapter *adapter, u8 *pbuf) ...@@ -942,8 +917,7 @@ void r8712_stadel_event_callback(struct _adapter *adapter, u8 *pbuf)
pdev_network = &(adapter->registrypriv.dev_network); pdev_network = &(adapter->registrypriv.dev_network);
pibss = adapter->registrypriv.dev_network.MacAddress; pibss = adapter->registrypriv.dev_network.MacAddress;
memcpy(pdev_network, &tgt_network->network, memcpy(pdev_network, &tgt_network->network,
r8712_get_wlan_bssid_ex_sz(&tgt_network-> r8712_get_wlan_bssid_ex_sz(&tgt_network->network));
network));
memcpy(&pdev_network->Ssid, memcpy(&pdev_network->Ssid,
&pmlmepriv->assoc_ssid, &pmlmepriv->assoc_ssid,
sizeof(struct ndis_802_11_ssid)); sizeof(struct ndis_802_11_ssid));
...@@ -1092,8 +1066,7 @@ int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv) ...@@ -1092,8 +1066,7 @@ int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv)
src_ssid = pmlmepriv->assoc_bssid; src_ssid = pmlmepriv->assoc_bssid;
if (!memcmp(dst_ssid, src_ssid, ETH_ALEN)) { if (!memcmp(dst_ssid, src_ssid, ETH_ALEN)) {
if (check_fwstate(pmlmepriv, _FW_LINKED)) { if (check_fwstate(pmlmepriv, _FW_LINKED)) {
if (is_same_network(&pmlmepriv-> if (is_same_network(&pmlmepriv->cur_network.network,
cur_network.network,
&pnetwork->network)) { &pnetwork->network)) {
_clr_fwstate_(pmlmepriv, _clr_fwstate_(pmlmepriv,
_FW_UNDER_LINKING); _FW_UNDER_LINKING);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册