From: Denis Kenzior <denkenz@gmail.com>
To: iwd@lists.linux.dev
Cc: Denis Kenzior <denkenz@gmail.com>
Subject: [PATCH 2/3] netdev: Simplify netdev_auth_cb error logic
Date: Tue, 14 Nov 2023 18:05:32 -0600 [thread overview]
Message-ID: <20231115000547.1139157-2-denkenz@gmail.com> (raw)
In-Reply-To: <20231115000547.1139157-1-denkenz@gmail.com>
---
src/netdev.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/netdev.c b/src/netdev.c
index 4a418b60abcf..327be768d3d9 100644
--- a/src/netdev.c
+++ b/src/netdev.c
@@ -3240,25 +3240,22 @@ static void netdev_auth_cb(struct l_genl_msg *msg, void *user_data)
l_debug("Error during auth: %d", err);
- if (!netdev->auth_cmd || err != -ENOENT) {
- netdev_connect_failed(netdev,
- NETDEV_RESULT_AUTHENTICATION_FAILED,
- MMPDU_STATUS_CODE_UNSPECIFIED);
- return;
- }
+ if (!netdev->auth_cmd || err != -ENOENT)
+ goto failed;
/* Kernel can't find the BSS in its cache, scan and retry */
scan_msg = scan_build_trigger_scan_bss(netdev->index, netdev->wiphy,
netdev->frequency,
hs->ssid, hs->ssid_len);
- if (!l_genl_family_send(nl80211, scan_msg,
- netdev_scan_cb, netdev, NULL)) {
- l_genl_msg_unref(scan_msg);
- netdev_connect_failed(netdev,
- NETDEV_RESULT_AUTHENTICATION_FAILED,
+ if (l_genl_family_send(nl80211, scan_msg,
+ netdev_scan_cb, netdev, NULL) > 0)
+ return;
+
+ l_genl_msg_unref(scan_msg);
+failed:
+ netdev_connect_failed(netdev, NETDEV_RESULT_AUTHENTICATION_FAILED,
MMPDU_STATUS_CODE_UNSPECIFIED);
- }
}
static void netdev_new_scan_results_event(struct l_genl_msg *msg,
--
2.42.0
next prev parent reply other threads:[~2023-11-15 0:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-15 0:05 [PATCH 1/3] netdev: Remove improper use of netdev_connect_failed Denis Kenzior
2023-11-15 0:05 ` Denis Kenzior [this message]
2023-11-15 0:05 ` [PATCH 3/3] netdev: Separate connect_failed and disconnected paths Denis Kenzior
2023-11-15 18:27 ` James Prestwood
2023-11-15 19:07 ` Denis Kenzior
2023-11-15 19:07 ` [PATCH 1/3] netdev: Remove improper use of netdev_connect_failed Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231115000547.1139157-2-denkenz@gmail.com \
--to=denkenz@gmail.com \
--cc=iwd@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox