* [PATCH] staging: rtl8712: Avoid multiple line dereference
@ 2020-03-20 9:14 Gokce Kuler
2020-03-20 13:41 ` [Outreachy kernel] " Julia Lawall
0 siblings, 1 reply; 4+ messages in thread
From: Gokce Kuler @ 2020-03-20 9:14 UTC (permalink / raw)
To: outreachy-kernel; +Cc: gregkh
merge a line -> with a line ending with a sign
Signed-off-by: Gokce Kuler <gokcekuler@gmail.com>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index 74dac74..7d5a50a 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -1094,8 +1094,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);
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Outreachy kernel] [PATCH] staging: rtl8712: Avoid multiple line dereference
2020-03-20 9:14 [PATCH] staging: rtl8712: Avoid multiple line dereference Gokce Kuler
@ 2020-03-20 13:41 ` Julia Lawall
0 siblings, 0 replies; 4+ messages in thread
From: Julia Lawall @ 2020-03-20 13:41 UTC (permalink / raw)
To: Gokce Kuler; +Cc: outreachy-kernel, gregkh
On Fri, 20 Mar 2020, Gokce Kuler wrote:
> merge a line -> with a line ending with a sign
>
> Signed-off-by: Gokce Kuler <gokcekuler@gmail.com>
> ---
> drivers/staging/rtl8712/rtl871x_mlme.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
> index 74dac74..7d5a50a 100644
> --- a/drivers/staging/rtl8712/rtl871x_mlme.c
> +++ b/drivers/staging/rtl8712/rtl871x_mlme.c
> @@ -1094,8 +1094,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)) {
It's not really ideal to have the second argument so far to the left like
this. It should be aligned with the right side of the ( after
is_same_network.
julia
> _clr_fwstate_(pmlmepriv,
> _FW_UNDER_LINKING);
> --
> 2.7.4
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20200320091413.GA6302%40siyah2.
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: rtl8712: avoid multiple line dereference
2021-04-06 23:15 [PATCH] staging: rtl8712: avoid " Sergei Krainov
@ 2021-04-07 5:40 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2021-04-07 5:40 UTC (permalink / raw)
To: Sergei Krainov
Cc: Larry.Finger, florian.c.schilhabel, linux-staging, linux-kernel,
kernel-janitors
On Wed, Apr 07, 2021 at 01:15:17AM +0200, Sergei Krainov wrote:
> fix post-commit hook checkpatch issues:
>
> WARNING: Avoid multiple line dereference - prefer 'adapter->mlmepriv.cur_network.network.InfrastructureMode'
> + adapter->mlmepriv.cur_network.network.
> + InfrastructureMode)
>
> WARNING: Avoid multiple line dereference - prefer 'adapter->registrypriv.dev_network.MacAddress'
> + adapter->registrypriv.
> + dev_network.MacAddress;
>
> WARNING: Avoid multiple line dereference - prefer 'pnetwork->network.Configuration.FHConfig.DwellTime'
> + le32_to_cpu(pnetwork->network.Configuration.FHConfig.
> + DwellTime);
>
> WARNING: Avoid multiple line dereference - prefer 'pnetwork->network.Configuration.FHConfig.HopPattern'
> + le32_to_cpu(pnetwork->network.Configuration.
> + FHConfig.HopPattern);
>
> WARNING: Avoid multiple line dereference - prefer 'pmlmepriv->scanned_queue'
> + r8712_find_network(&pmlmepriv->
> + scanned_queue,
>
> WARNING: Avoid multiple line dereference - prefer 'pmlmepriv->scanned_queue'
> + r8712_find_network(&pmlmepriv->
> + scanned_queue,
>
> WARNING: Avoid multiple line dereference - prefer 'pstapriv->sta_hash_lock'
> + spin_lock_irqsave(&pstapriv->
> + sta_hash_lock, irqL2);
>
> WARNING: Avoid multiple line dereference - prefer 'pstapriv->sta_hash_lock'
> + spin_unlock_irqrestore(&(pstapriv->
> + sta_hash_lock), irqL2);
>
> WARNING: Avoid multiple line dereference - prefer 'pmlmepriv->scanned_queue'
> + r8712_find_network(&pmlmepriv->
> + scanned_queue,
>
> WARNING: Avoid multiple line dereference - prefer 'pnetwork->network.MacAddress'
> + pnetwork->network.
> + MacAddress);
>
> WARNING: Avoid multiple line dereference - prefer 'pmlmepriv->scanned_queue'
> + ptarget_wlan = r8712_find_network(&pmlmepriv->
> + scanned_queue,
>
> WARNING: Avoid multiple line dereference - prefer 'adapter->securitypriv.AuthAlgrthm'
> + if (adapter->securitypriv.
> + AuthAlgrthm == 2) {
>
> WARNING: Avoid multiple line dereference - prefer 'adapter->securitypriv.binstallGrpkey'
> + adapter->securitypriv.
> + binstallGrpkey =
>
> WARNING: Avoid multiple line dereference - prefer 'adapter->securitypriv.busetkipkey'
> + adapter->securitypriv.
> + busetkipkey =
>
> WARNING: Avoid multiple line dereference - prefer 'adapter->securitypriv.bgrpkey_handshake'
> + adapter->securitypriv.
> + bgrpkey_handshake =
>
> WARNING: Avoid multiple line dereference - prefer 'adapter->securitypriv.PrivacyAlgrthm'
> + adapter->securitypriv.
> + PrivacyAlgrthm;
>
> WARNING: Avoid multiple line dereference - prefer 'ptarget_sta->x_UncstKey'
> + memset((u8 *)&ptarget_sta->
> + x_UncstKey,
>
> WARNING: Avoid multiple line dereference - prefer 'ptarget_sta->tkiprxmickey'
> + memset((u8 *)&ptarget_sta->
> + tkiprxmickey,
>
> WARNING: Avoid multiple line dereference - prefer 'ptarget_sta->tkiptxmickey'
> + memset((u8 *)&ptarget_sta->
> + tkiptxmickey,
>
> WARNING: Avoid multiple line dereference - prefer 'ptarget_sta->txpn'
> + memset((u8 *)&ptarget_sta->
> + txpn, 0,
>
> WARNING: Avoid multiple line dereference - prefer 'ptarget_sta->rxpn'
> + memset((u8 *)&ptarget_sta->
> + rxpn, 0,
>
> WARNING: Avoid multiple line dereference - prefer 'tgt_network->network'
> + r8712_get_wlan_bssid_ex_sz(&tgt_network->
> + network));
>
> WARNING: Avoid multiple line dereference - prefer 'pmlmepriv->cur_network.network'
> + if (is_same_network(&pmlmepriv->
> + cur_network.network,
>
That's a lot of information we don't need in a changelog text, please
summarize when possible :)
> ptarget_wlan =
> - r8712_find_network(&pmlmepriv->
> - scanned_queue,
> - pnetwork->network.
> - MacAddress);
> + r8712_find_network(&pmlmepriv->scanned_queue,
> + pnetwork->network.MacAddress);
As bad as the original line here is, this isn't all that much better at
all, right? How about working to fix the huge indentation levels in
this function instead, which will resolve all of this mess properly?
That would be a much better way to solve this.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] staging: rtl8712: avoid multiple line dereference
@ 2021-04-06 23:15 Sergei Krainov
2021-04-07 5:40 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Sergei Krainov @ 2021-04-06 23:15 UTC (permalink / raw)
To: Larry.Finger, florian.c.schilhabel, gregkh
Cc: linux-staging, linux-kernel, kernel-janitors
fix post-commit hook checkpatch issues:
WARNING: Avoid multiple line dereference - prefer 'adapter->mlmepriv.cur_network.network.InfrastructureMode'
+ adapter->mlmepriv.cur_network.network.
+ InfrastructureMode)
WARNING: Avoid multiple line dereference - prefer 'adapter->registrypriv.dev_network.MacAddress'
+ adapter->registrypriv.
+ dev_network.MacAddress;
WARNING: Avoid multiple line dereference - prefer 'pnetwork->network.Configuration.FHConfig.DwellTime'
+ le32_to_cpu(pnetwork->network.Configuration.FHConfig.
+ DwellTime);
WARNING: Avoid multiple line dereference - prefer 'pnetwork->network.Configuration.FHConfig.HopPattern'
+ le32_to_cpu(pnetwork->network.Configuration.
+ FHConfig.HopPattern);
WARNING: Avoid multiple line dereference - prefer 'pmlmepriv->scanned_queue'
+ r8712_find_network(&pmlmepriv->
+ scanned_queue,
WARNING: Avoid multiple line dereference - prefer 'pmlmepriv->scanned_queue'
+ r8712_find_network(&pmlmepriv->
+ scanned_queue,
WARNING: Avoid multiple line dereference - prefer 'pstapriv->sta_hash_lock'
+ spin_lock_irqsave(&pstapriv->
+ sta_hash_lock, irqL2);
WARNING: Avoid multiple line dereference - prefer 'pstapriv->sta_hash_lock'
+ spin_unlock_irqrestore(&(pstapriv->
+ sta_hash_lock), irqL2);
WARNING: Avoid multiple line dereference - prefer 'pmlmepriv->scanned_queue'
+ r8712_find_network(&pmlmepriv->
+ scanned_queue,
WARNING: Avoid multiple line dereference - prefer 'pnetwork->network.MacAddress'
+ pnetwork->network.
+ MacAddress);
WARNING: Avoid multiple line dereference - prefer 'pmlmepriv->scanned_queue'
+ ptarget_wlan = r8712_find_network(&pmlmepriv->
+ scanned_queue,
WARNING: Avoid multiple line dereference - prefer 'adapter->securitypriv.AuthAlgrthm'
+ if (adapter->securitypriv.
+ AuthAlgrthm == 2) {
WARNING: Avoid multiple line dereference - prefer 'adapter->securitypriv.binstallGrpkey'
+ adapter->securitypriv.
+ binstallGrpkey =
WARNING: Avoid multiple line dereference - prefer 'adapter->securitypriv.busetkipkey'
+ adapter->securitypriv.
+ busetkipkey =
WARNING: Avoid multiple line dereference - prefer 'adapter->securitypriv.bgrpkey_handshake'
+ adapter->securitypriv.
+ bgrpkey_handshake =
WARNING: Avoid multiple line dereference - prefer 'adapter->securitypriv.PrivacyAlgrthm'
+ adapter->securitypriv.
+ PrivacyAlgrthm;
WARNING: Avoid multiple line dereference - prefer 'ptarget_sta->x_UncstKey'
+ memset((u8 *)&ptarget_sta->
+ x_UncstKey,
WARNING: Avoid multiple line dereference - prefer 'ptarget_sta->tkiprxmickey'
+ memset((u8 *)&ptarget_sta->
+ tkiprxmickey,
WARNING: Avoid multiple line dereference - prefer 'ptarget_sta->tkiptxmickey'
+ memset((u8 *)&ptarget_sta->
+ tkiptxmickey,
WARNING: Avoid multiple line dereference - prefer 'ptarget_sta->txpn'
+ memset((u8 *)&ptarget_sta->
+ txpn, 0,
WARNING: Avoid multiple line dereference - prefer 'ptarget_sta->rxpn'
+ memset((u8 *)&ptarget_sta->
+ rxpn, 0,
WARNING: Avoid multiple line dereference - prefer 'tgt_network->network'
+ r8712_get_wlan_bssid_ex_sz(&tgt_network->
+ network));
WARNING: Avoid multiple line dereference - prefer 'pmlmepriv->cur_network.network'
+ if (is_same_network(&pmlmepriv->
+ cur_network.network,
Signed-off-by: Sergei Krainov <sergei.krainov.lkd@gmail.com>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 73 +++++++++-----------------
1 file changed, 25 insertions(+), 48 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index 8a97307fbbd6..26acb4069d3d 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -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,29 @@ 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 =
+ if (adapter->securitypriv.AuthAlgrthm == 2) {
+ adapter->securitypriv.binstallGrpkey =
false;
- adapter->securitypriv.
- busetkipkey =
+ adapter->securitypriv.busetkipkey =
false;
- adapter->securitypriv.
- bgrpkey_handshake =
+ adapter->securitypriv.bgrpkey_handshake =
false;
- ptarget_sta->ieee8021x_blocked
- = true;
+ ptarget_sta->ieee8021x_blocked =
+ true;
ptarget_sta->XPrivacy =
- adapter->securitypriv.
- PrivacyAlgrthm;
- memset((u8 *)&ptarget_sta->
- x_UncstKey,
+ 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 +921,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 +1070,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);
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-07 5:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-20 9:14 [PATCH] staging: rtl8712: Avoid multiple line dereference Gokce Kuler
2020-03-20 13:41 ` [Outreachy kernel] " Julia Lawall
2021-04-06 23:15 [PATCH] staging: rtl8712: avoid " Sergei Krainov
2021-04-07 5:40 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.