* [PATCH v2] staging: rtl8712: Adjust if statements to reduce indentation level
@ 2018-06-16 6:03 ` Joonhwan Kim
0 siblings, 0 replies; 4+ messages in thread
From: Joonhwan Kim @ 2018-06-16 6:03 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, florian.c.schilhabel, liamryandev, martin, devel,
linux-kernel, stefano.manni, kernel-janitors
Merge two condition of if statements in
r8712_surveydone_event_callback()
Signed-off-by: Joonhwan Kim <spilit464@gmail.com>
---
v2: fix my name without period in email header
drivers/staging/rtl8712/rtl871x_mlme.c | 51 +++++++++++++-------------
1 file changed, 25 insertions(+), 26 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index ac547ddd72d1..b8618b0565d5 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -566,32 +566,31 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf)
}
if (pmlmepriv->to_join) {
- if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
- if (!check_fwstate(pmlmepriv, _FW_LINKED)) {
- set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
-
- if (r8712_select_and_join_from_scan(pmlmepriv)
- == _SUCCESS) {
- mod_timer(&pmlmepriv->assoc_timer, jiffies +
- msecs_to_jiffies(MAX_JOIN_TIMEOUT));
- } else {
- struct wlan_bssid_ex *pdev_network =
- &(adapter->registrypriv.dev_network);
- u8 *pibss =
- adapter->registrypriv.
- dev_network.MacAddress;
- pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;
- memcpy(&pdev_network->Ssid,
- &pmlmepriv->assoc_ssid,
- sizeof(struct
- ndis_802_11_ssid));
- r8712_update_registrypriv_dev_network
- (adapter);
- r8712_generate_random_ibss(pibss);
- pmlmepriv->fw_state =
- WIFI_ADHOC_MASTER_STATE;
- pmlmepriv->to_join = false;
- }
+ if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) &&
+ !check_fwstate(pmlmepriv, _FW_LINKED)) {
+ set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
+
+ if (r8712_select_and_join_from_scan(pmlmepriv)
+ == _SUCCESS) {
+ mod_timer(&pmlmepriv->assoc_timer, jiffies +
+ msecs_to_jiffies(MAX_JOIN_TIMEOUT));
+ } else {
+ struct wlan_bssid_ex *pdev_network =
+ &(adapter->registrypriv.dev_network);
+ u8 *pibss =
+ adapter->registrypriv.
+ dev_network.MacAddress;
+ pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;
+ memcpy(&pdev_network->Ssid,
+ &pmlmepriv->assoc_ssid,
+ sizeof(struct
+ ndis_802_11_ssid));
+ r8712_update_registrypriv_dev_network
+ (adapter);
+ r8712_generate_random_ibss(pibss);
+ pmlmepriv->fw_state =
+ WIFI_ADHOC_MASTER_STATE;
+ pmlmepriv->to_join = false;
}
} else {
pmlmepriv->to_join = false;
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2] staging: rtl8712: Adjust if statements to reduce indentation level
@ 2018-06-16 6:03 ` Joonhwan Kim
0 siblings, 0 replies; 4+ messages in thread
From: Joonhwan Kim @ 2018-06-16 6:03 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, florian.c.schilhabel, liamryandev, martin, devel,
linux-kernel, stefano.manni, kernel-janitors
Merge two condition of if statements in
r8712_surveydone_event_callback()
Signed-off-by: Joonhwan Kim <spilit464@gmail.com>
---
v2: fix my name without period in email header
drivers/staging/rtl8712/rtl871x_mlme.c | 51 +++++++++++++-------------
1 file changed, 25 insertions(+), 26 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index ac547ddd72d1..b8618b0565d5 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -566,32 +566,31 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf)
}
if (pmlmepriv->to_join) {
- if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
- if (!check_fwstate(pmlmepriv, _FW_LINKED)) {
- set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
-
- if (r8712_select_and_join_from_scan(pmlmepriv)
- = _SUCCESS) {
- mod_timer(&pmlmepriv->assoc_timer, jiffies +
- msecs_to_jiffies(MAX_JOIN_TIMEOUT));
- } else {
- struct wlan_bssid_ex *pdev_network - &(adapter->registrypriv.dev_network);
- u8 *pibss - adapter->registrypriv.
- dev_network.MacAddress;
- pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;
- memcpy(&pdev_network->Ssid,
- &pmlmepriv->assoc_ssid,
- sizeof(struct
- ndis_802_11_ssid));
- r8712_update_registrypriv_dev_network
- (adapter);
- r8712_generate_random_ibss(pibss);
- pmlmepriv->fw_state - WIFI_ADHOC_MASTER_STATE;
- pmlmepriv->to_join = false;
- }
+ if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) &&
+ !check_fwstate(pmlmepriv, _FW_LINKED)) {
+ set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
+
+ if (r8712_select_and_join_from_scan(pmlmepriv)
+ = _SUCCESS) {
+ mod_timer(&pmlmepriv->assoc_timer, jiffies +
+ msecs_to_jiffies(MAX_JOIN_TIMEOUT));
+ } else {
+ struct wlan_bssid_ex *pdev_network + &(adapter->registrypriv.dev_network);
+ u8 *pibss + adapter->registrypriv.
+ dev_network.MacAddress;
+ pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;
+ memcpy(&pdev_network->Ssid,
+ &pmlmepriv->assoc_ssid,
+ sizeof(struct
+ ndis_802_11_ssid));
+ r8712_update_registrypriv_dev_network
+ (adapter);
+ r8712_generate_random_ibss(pibss);
+ pmlmepriv->fw_state + WIFI_ADHOC_MASTER_STATE;
+ pmlmepriv->to_join = false;
}
} else {
pmlmepriv->to_join = false;
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] staging: rtl8712: Adjust if statements to reduce indentation level
2018-06-16 6:03 ` Joonhwan Kim
@ 2018-06-16 23:00 ` Joe Perches
-1 siblings, 0 replies; 4+ messages in thread
From: Joe Perches @ 2018-06-16 23:00 UTC (permalink / raw)
To: Joonhwan Kim, gregkh
Cc: Larry.Finger, florian.c.schilhabel, liamryandev, martin, devel,
linux-kernel, stefano.manni, kernel-janitors
On Sat, 2018-06-16 at 15:03 +0900, Joonhwan Kim wrote:
> Merge two condition of if statements in
> r8712_surveydone_event_callback()
Are you sure you are not changing the logic here?
I think it'd be nicer to refactor the code instead.
Something like:
---
drivers/staging/rtl8712/rtl871x_mlme.c | 73 +++++++++++++++++-----------------
1 file changed, 36 insertions(+), 37 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index ac547ddd72d1..d711305b33e1 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -552,6 +552,19 @@ void r8712_survey_event_callback(struct _adapter *adapter, u8 *pbuf)
spin_unlock_irqrestore(&pmlmepriv->lock2, flags);
}
+static bool r8712_under_linking_then_join(struct mlme_priv *pmlmepriv)
+{
+ set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
+
+ if (r8712_select_and_join_from_scan(pmlmepriv) != _SUCCESS)
+ return false;
+
+ mod_timer(&pmlmepriv->assoc_timer,
+ jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT));
+
+ return true;
+}
+
void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf)
{
unsigned long irqL;
@@ -565,45 +578,31 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf)
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
}
- if (pmlmepriv->to_join) {
- if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
- if (!check_fwstate(pmlmepriv, _FW_LINKED)) {
- set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
+ if (!pmlmepriv->to_join)
+ goto exit;
+
+ if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
+ if (check_fwstate(pmlmepriv, _FW_LINKED) ||
+ r8712_under_linking_then_join(pmlmepriv))
+ goto exit;
+
+ pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;
+ memcpy(&adapter->registrypriv.dev_network.Ssid,
+ &pmlmepriv->assoc_ssid,
+ sizeof(struct ndis_802_11_ssid));
+ r8712_update_registrypriv_dev_network(adapter);
+ r8712_generate_random_ibss(adapter->registrypriv.dev_network.MacAddress);
+ pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE;
+ pmlmepriv->to_join = false;
+ } else {
+ pmlmepriv->to_join = false;
+ if (r8712_under_linking_then_join(pmlmepriv))
+ goto exit;
- if (r8712_select_and_join_from_scan(pmlmepriv)
- == _SUCCESS) {
- mod_timer(&pmlmepriv->assoc_timer, jiffies +
- msecs_to_jiffies(MAX_JOIN_TIMEOUT));
- } else {
- struct wlan_bssid_ex *pdev_network =
- &(adapter->registrypriv.dev_network);
- u8 *pibss =
- adapter->registrypriv.
- dev_network.MacAddress;
- pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;
- memcpy(&pdev_network->Ssid,
- &pmlmepriv->assoc_ssid,
- sizeof(struct
- ndis_802_11_ssid));
- r8712_update_registrypriv_dev_network
- (adapter);
- r8712_generate_random_ibss(pibss);
- pmlmepriv->fw_state =
- WIFI_ADHOC_MASTER_STATE;
- pmlmepriv->to_join = false;
- }
- }
- } else {
- pmlmepriv->to_join = false;
- set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
- if (r8712_select_and_join_from_scan(pmlmepriv) ==
- _SUCCESS)
- mod_timer(&pmlmepriv->assoc_timer, jiffies +
- msecs_to_jiffies(MAX_JOIN_TIMEOUT));
- else
- _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
- }
+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
}
+
+exit:
spin_unlock_irqrestore(&pmlmepriv->lock, irqL);
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] staging: rtl8712: Adjust if statements to reduce indentation level
@ 2018-06-16 23:00 ` Joe Perches
0 siblings, 0 replies; 4+ messages in thread
From: Joe Perches @ 2018-06-16 23:00 UTC (permalink / raw)
To: Joonhwan Kim, gregkh
Cc: Larry.Finger, florian.c.schilhabel, liamryandev, martin, devel,
linux-kernel, stefano.manni, kernel-janitors
On Sat, 2018-06-16 at 15:03 +0900, Joonhwan Kim wrote:
> Merge two condition of if statements in
> r8712_surveydone_event_callback()
Are you sure you are not changing the logic here?
I think it'd be nicer to refactor the code instead.
Something like:
---
drivers/staging/rtl8712/rtl871x_mlme.c | 73 +++++++++++++++++-----------------
1 file changed, 36 insertions(+), 37 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index ac547ddd72d1..d711305b33e1 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -552,6 +552,19 @@ void r8712_survey_event_callback(struct _adapter *adapter, u8 *pbuf)
spin_unlock_irqrestore(&pmlmepriv->lock2, flags);
}
+static bool r8712_under_linking_then_join(struct mlme_priv *pmlmepriv)
+{
+ set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
+
+ if (r8712_select_and_join_from_scan(pmlmepriv) != _SUCCESS)
+ return false;
+
+ mod_timer(&pmlmepriv->assoc_timer,
+ jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT));
+
+ return true;
+}
+
void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf)
{
unsigned long irqL;
@@ -565,45 +578,31 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf)
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
}
- if (pmlmepriv->to_join) {
- if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
- if (!check_fwstate(pmlmepriv, _FW_LINKED)) {
- set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
+ if (!pmlmepriv->to_join)
+ goto exit;
+
+ if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
+ if (check_fwstate(pmlmepriv, _FW_LINKED) ||
+ r8712_under_linking_then_join(pmlmepriv))
+ goto exit;
+
+ pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;
+ memcpy(&adapter->registrypriv.dev_network.Ssid,
+ &pmlmepriv->assoc_ssid,
+ sizeof(struct ndis_802_11_ssid));
+ r8712_update_registrypriv_dev_network(adapter);
+ r8712_generate_random_ibss(adapter->registrypriv.dev_network.MacAddress);
+ pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE;
+ pmlmepriv->to_join = false;
+ } else {
+ pmlmepriv->to_join = false;
+ if (r8712_under_linking_then_join(pmlmepriv))
+ goto exit;
- if (r8712_select_and_join_from_scan(pmlmepriv)
- = _SUCCESS) {
- mod_timer(&pmlmepriv->assoc_timer, jiffies +
- msecs_to_jiffies(MAX_JOIN_TIMEOUT));
- } else {
- struct wlan_bssid_ex *pdev_network - &(adapter->registrypriv.dev_network);
- u8 *pibss - adapter->registrypriv.
- dev_network.MacAddress;
- pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;
- memcpy(&pdev_network->Ssid,
- &pmlmepriv->assoc_ssid,
- sizeof(struct
- ndis_802_11_ssid));
- r8712_update_registrypriv_dev_network
- (adapter);
- r8712_generate_random_ibss(pibss);
- pmlmepriv->fw_state - WIFI_ADHOC_MASTER_STATE;
- pmlmepriv->to_join = false;
- }
- }
- } else {
- pmlmepriv->to_join = false;
- set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
- if (r8712_select_and_join_from_scan(pmlmepriv) =
- _SUCCESS)
- mod_timer(&pmlmepriv->assoc_timer, jiffies +
- msecs_to_jiffies(MAX_JOIN_TIMEOUT));
- else
- _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
- }
+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
}
+
+exit:
spin_unlock_irqrestore(&pmlmepriv->lock, irqL);
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-06-16 23:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-16 6:03 [PATCH v2] staging: rtl8712: Adjust if statements to reduce indentation level Joonhwan Kim
2018-06-16 6:03 ` Joonhwan Kim
2018-06-16 23:00 ` Joe Perches
2018-06-16 23:00 ` Joe Perches
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.