From: James Prestwood <prestwoj@gmail.com>
To: iwd@lists.linux.dev
Cc: James Prestwood <prestwoj@gmail.com>
Subject: [PATCH v2 2/3] dpp: make station connected check better, remove duplicate
Date: Fri, 10 Nov 2023 06:16:19 -0800 [thread overview]
Message-ID: <20231110141620.80195-2-prestwoj@gmail.com> (raw)
In-Reply-To: <20231110141620.80195-1-prestwoj@gmail.com>
Checking if station has a connected network set was fine, but
checking the state is more clear/explicit.
This also removes a duplicate check.
---
src/dpp.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/dpp.c b/src/dpp.c
index daa49410..f1ea01ff 100644
--- a/src/dpp.c
+++ b/src/dpp.c
@@ -4067,14 +4067,8 @@ static void dpp_pkex_scan_destroy(void *user_data)
static bool dpp_start_pkex_enrollee(struct dpp_sm *dpp, const char *key,
const char *identifier)
{
- struct station *station = station_find(netdev_get_ifindex(dpp->netdev));
_auto_(l_ecc_point_free) struct l_ecc_point *qi = NULL;
- if (station && station_get_connected_network(station)) {
- l_debug("Already connected, disconnect before enrolling");
- return false;
- }
-
if (identifier)
dpp->pkex_id = l_strdup(identifier);
@@ -4194,7 +4188,7 @@ static struct l_dbus_message *dpp_dbus_pkex_start_enrollee(struct l_dbus *dbus,
dpp->interface != DPP_INTERFACE_UNBOUND)
return dbus_error_busy(message);
- if (station_get_connected_network(station))
+ if (station && station_get_state(station) != STATION_STATE_DISCONNECTED)
return dbus_error_busy(message);
if (!dpp_parse_pkex_args(message, &key, &id))
--
2.25.1
next prev parent reply other threads:[~2023-11-10 14:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-10 14:16 [PATCH v2 1/3] dpp: scan to pick up extra frequencies when enrolling James Prestwood
2023-11-10 14:16 ` James Prestwood [this message]
2023-11-10 14:16 ` [PATCH v2 3/3] dpp: add station watch to DPP James Prestwood
2023-11-10 18:19 ` James Prestwood
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=20231110141620.80195-2-prestwoj@gmail.com \
--to=prestwoj@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