diff --git a/Revert-Mark-authorization-completed-on-driver-indica.patch b/Revert-Mark-authorization-completed-on-driver-indica.patch
new file mode 100644
index 0000000..a0282a7
--- /dev/null
+++ b/Revert-Mark-authorization-completed-on-driver-indica.patch
@@ -0,0 +1,51 @@
+From c970f0f54fd33307e90e355f40d436dfa084c35e Mon Sep 17 00:00:00 2001
+From: Clemens Famulla-Conrad <cfamullaconrad@suse.de>
+Date: Fri, 20 Sep 2024 12:35:04 +0200
+Subject: [PATCH] Revert "Mark authorization completed on driver indication
+ during 4-way HS offload"
+Reference: bsc#1230797
+
+This reverts commit 41638606054a09867fe3f9a2b5523aa4678cbfa5.
+---
+ 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 49917f7aa..bbb3a3eda 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)) {
+ 		/*
+-- 
+2.43.0
+
diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes
index fbf4efa..ff6fe97 100644
--- a/wpa_supplicant.changes
+++ b/wpa_supplicant.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 20 10:37:22 UTC 2024 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>
+
+- Revert "Mark authorization completed on driver indication
+  during 4-way HS offload" because of WPA2-PSK/WPA-SAE connection
+  problems with brcmfmac wifi hardware. (bsc#1230797) 
+  [+ Revert-Mark-authorization-completed-on-driver-indica.patch]
+
 -------------------------------------------------------------------
 Wed Sep 11 14:44:58 UTC 2024 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>
 
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index 43f4ad3..f316e22 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -38,6 +38,7 @@ Patch1:         wpa_supplicant-flush-debug-output.patch
 Patch2:         wpa_supplicant-sigusr1-changes-debuglevel.patch
 Patch3:         wpa_supplicant-alloc_size.patch
 Patch5:         wpa_supplicant-dump-certificate-as-PEM-in-debug-mode.diff
+Patch6:         Revert-Mark-authorization-completed-on-driver-indica.patch
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
 BuildRequires:  systemd-rpm-macros