Drop a patch applied upstream

2 files changed, 0 insertions, 83 deletions

diff --git a/debian/patches/2.8-fixes/0002-supplicant-use-separate-flag-for-4-way-handshake-offload.patch b/debian/patches/2.8-fixes/0002-supplicant-use-separate-flag-for-4-way-handshake-offload.patch
deleted file mode 100644
index 9b43d94..0000000
--- a/debian/patches/2.8-fixes/0002-supplicant-use-separate-flag-for-4-way-handshake-offload.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From: Arend van Spriel <arend.vanspriel@broadcom.com>
-To: Jouni Malinen <j@w1.fi>
-Subject: [PATCH] supplicant: use separate flag for 4-way handshake offload
-Date: Tue,  2 Jul 2019 00:13:49 +0200
-Message-Id: <1562019229-15410-1-git-send-email-arend.vanspriel@broadcom.com>
-Cc: hostap@lists.infradead.org, Arend van Spriel <arend.vanspriel@broadcom.com>
-
-Commit d896874f8689 ("nl80211: Indicate 802.1X 4-way handshake
-offload in connect") used the req_key_mgmt_offload flag to
-indicate to the driver that it should offload the 802.1X handshake.
-However, this field was existing and used for a different offload
-API. This causes wpa_supplicant to send a connect request without the
-WANT_1X_HS flag and the subsequent set-pmk is rejected causing the
-connection to fail. So this patch fixes that by introducing a new
-flag req_handshake_offload so the offloads are no longer entangled.
-
-Reported-by: Stefan Wahren <wahrenst@gmx.net>
-Tested-by: Stefan Wahren <wahrenst@gmx.net>
-Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
----
-Hi Jouni,
-
-I do not recall exactly what happened in commit d896874f8689. I suspect
-I revised the patch using req_key_mgmt_offload without spinning another
-test.
-
-Regards,
-Arend
----
- src/drivers/driver.h            | 8 ++++++++
- src/drivers/driver_nl80211.c    | 2 +-
- wpa_supplicant/wpa_supplicant.c | 2 +-
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/drivers/driver.h b/src/drivers/driver.h
-index 8a5cdb8..2a8459a 100644
---- a/src/drivers/driver.h
-+++ b/src/drivers/driver.h
-@@ -1074,6 +1074,14 @@ struct wpa_driver_associate_params {
- 	int req_key_mgmt_offload;
- 
- 	/**
-+	 * req_handshake_offload - Request EAPOL handshake offload
-+	 *
-+	 * Request EAPOL handshake offload for this connection if the device
-+	 * supports it.
-+	 */
-+	int req_handshake_offload;
-+
-+	/**
- 	 * Flag for indicating whether this association includes support for
- 	 * RRM (Radio Resource Measurements)
- 	 */
-diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
-index 45835a2..c44bd20 100644
---- a/src/drivers/driver_nl80211.c
-+++ b/src/drivers/driver_nl80211.c
-@@ -5632,7 +5632,7 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
- 			return -1;
- 	}
- 
--	if (params->req_key_mgmt_offload &&
-+	if (params->req_handshake_offload &&
- 	    (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X)) {
- 		    wpa_printf(MSG_DEBUG, "  * WANT_1X_4WAY_HS");
- 		    if (nla_put_flag(msg, NL80211_ATTR_WANT_1X_4WAY_HS))
-diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
-index 78eef38..911d79d 100644
---- a/wpa_supplicant/wpa_supplicant.c
-+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -3229,7 +3229,7 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
- 	     params.key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X_SHA256 ||
- 	     params.key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X_SUITE_B ||
- 	     params.key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X_SUITE_B_192))
--		params.req_key_mgmt_offload = 1;
-+		params.req_handshake_offload = 1;
- 
- 	if (wpa_s->conf->key_mgmt_offload) {
- 		if (params.key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X ||
--- 
-1.9.1
diff --git a/debian/patches/series b/debian/patches/series
index 65cb1ac..4c1d7fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,3 @@
 networkd-driver-fallback.patch
 wpa_supplicant_fix-dependency-odering-when-invoked-with-dbus.patch
 allow-tlsv1.patch
-# regress fixes from 2.8+
-2.8-fixes/0002-supplicant-use-separate-flag-for-4-way-handshake-offload.patch