From: "Sven Püschel" <s.pueschel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: "Sven Püschel" <s.pueschel@pengutronix.de>
Subject: [ptxdist] [PATCH] wpa_supplicant: version bump 2.10 -> 2.11
Date: Fri, 10 Oct 2025 11:58:31 +0200 [thread overview]
Message-ID: <20251010095934.1500534-2-s.pueschel@pengutronix.de> (raw)
Added a revert patch to fix potential WiFi problems on Rasberry PIs and
other devices using the hardware.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
...orization-completed-on-driver-indica.patch | 56 +++++++++++++++++++
patches/wpa_supplicant-2.11/series | 4 ++
rules/wpa_supplicant.make | 4 +-
3 files changed, 62 insertions(+), 2 deletions(-)
create mode 100644 patches/wpa_supplicant-2.11/0001-Revert-Mark-authorization-completed-on-driver-indica.patch
create mode 100644 patches/wpa_supplicant-2.11/series
diff --git a/patches/wpa_supplicant-2.11/0001-Revert-Mark-authorization-completed-on-driver-indica.patch b/patches/wpa_supplicant-2.11/0001-Revert-Mark-authorization-completed-on-driver-indica.patch
new file mode 100644
index 000000000..3c0fa4e52
--- /dev/null
+++ b/patches/wpa_supplicant-2.11/0001-Revert-Mark-authorization-completed-on-driver-indica.patch
@@ -0,0 +1,56 @@
+From: =?UTF-8?q?Sven=20P=C3=BCschel?= <s.pueschel@pengutronix.de>
+Date: Thu, 5 Dec 2024 17:19:25 +0100
+Subject: [PATCH] Revert "Mark authorization completed on driver indication
+ during 4-way HS offload"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch causes WiFi problems in combination with the upstream brcmfmac
+driver. Prominently this affects the WiFi on Raspberry PIs. See also [1].
+
+[1] https://lists.infradead.org/pipermail/hostap/2024-August/042936.html
+
+This reverts commit 41638606054a09867fe3f9a2b5523aa4678cbfa5.
+
+Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
+---
+ wpa_supplicant/events.c | 25 ++++++++-----------------
+ 1 file changed, 8 insertions(+), 17 deletions(-)
+
+diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
+index 49917f7aaf72..bbb3a3edae7d 100644
+--- a/wpa_supplicant/events.c
++++ b/wpa_supplicant/events.c
+@@ -4327,23 +4327,14 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
+ eapol_sm_notify_eap_success(wpa_s->eapol, true);
+ } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK) &&
+ wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) {
+- if (already_authorized) {
+- /*
+- * We are done; the driver will take care of RSN 4-way
+- * handshake.
+- */
+- wpa_supplicant_cancel_auth_timeout(wpa_s);
+- wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
+- eapol_sm_notify_portValid(wpa_s->eapol, true);
+- eapol_sm_notify_eap_success(wpa_s->eapol, true);
+- } else {
+- /* Update port, WPA_COMPLETED state from the
+- * EVENT_PORT_AUTHORIZED handler when the driver is done
+- * with the 4-way handshake.
+- */
+- wpa_msg(wpa_s, MSG_DEBUG,
+- "ASSOC INFO: wait for driver port authorized indication");
+- }
++ /*
++ * We are done; the driver will take care of RSN 4-way
++ * handshake.
++ */
++ wpa_supplicant_cancel_auth_timeout(wpa_s);
++ wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
++ eapol_sm_notify_portValid(wpa_s->eapol, true);
++ eapol_sm_notify_eap_success(wpa_s->eapol, true);
+ } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X) &&
+ wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) {
+ /*
diff --git a/patches/wpa_supplicant-2.11/series b/patches/wpa_supplicant-2.11/series
new file mode 100644
index 000000000..f91fcbdd4
--- /dev/null
+++ b/patches/wpa_supplicant-2.11/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Revert-Mark-authorization-completed-on-driver-indica.patch
+# a0d07b52ada50d5a9ee5d62918484ad8 - git-ptx-patches magic
diff --git a/rules/wpa_supplicant.make b/rules/wpa_supplicant.make
index 644df4fcb..87ec53605 100644
--- a/rules/wpa_supplicant.make
+++ b/rules/wpa_supplicant.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_WPA_SUPPLICANT) += wpa_supplicant
# Paths and names
#
WPA_SUPPLICANT_NAME := wpa_supplicant
-WPA_SUPPLICANT_VERSION := 2.10
-WPA_SUPPLICANT_MD5 := d26797fcb002898d4ee989179346e1cc
+WPA_SUPPLICANT_VERSION := 2.11
+WPA_SUPPLICANT_MD5 := 72a4a00eddb7a499a58113c3361ab094
WPA_SUPPLICANT := $(WPA_SUPPLICANT_NAME)-$(WPA_SUPPLICANT_VERSION)
WPA_SUPPLICANT_SUFFIX := tar.gz
WPA_SUPPLICANT_URL := https://w1.fi/releases/$(WPA_SUPPLICANT).$(WPA_SUPPLICANT_SUFFIX)
--
2.47.3
reply other threads:[~2025-10-10 9:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20251010095934.1500534-2-s.pueschel@pengutronix.de \
--to=s.pueschel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/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