diff options
| author | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2020-05-01 18:31:34 +0200 |
|---|---|---|
| committer | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2020-05-01 18:34:47 +0200 |
| commit | 6d12102004c68dc8197ed5a6803688caa5ed3361 (patch) | |
| tree | 40238347107068f69dd7f519238e03c4f89a4d50 | |
| parent | 25c5e42678364e8b0a7d0c540ef3fe29648705bc (diff) | |
Refresh the FT patchdebian/2%2.7+git20190128+0c1e29f-6+deb10u2
| -rw-r--r-- | debian/patches/upstream-fixes/0003-check-for-ft-support.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/upstream-fixes/0003-check-for-ft-support.patch b/debian/patches/upstream-fixes/0003-check-for-ft-support.patch index ca4b514..6f0b0d9 100644 --- a/debian/patches/upstream-fixes/0003-check-for-ft-support.patch +++ b/debian/patches/upstream-fixes/0003-check-for-ft-support.patch @@ -21,10 +21,10 @@ Reviewed-by: Brian Norris <briannorris@chromium.org> 3 files changed, 14 insertions(+) diff --git a/src/drivers/driver.h b/src/drivers/driver.h -index 9bdf880..d23e436 100644 +index 23423d9..1b2969e 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h -@@ -1659,6 +1659,8 @@ +@@ -1618,6 +1618,8 @@ struct wpa_driver_capa { #define WPA_DRIVER_FLAGS_FTM_RESPONDER 0x0100000000000000ULL /** Driver support 4-way handshake offload for WPA-Personal */ #define WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK 0x0200000000000000ULL @@ -34,7 +34,7 @@ index 9bdf880..d23e436 100644 #define FULL_AP_CLIENT_STATE_SUPP(drv_flags) \ diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c -index 31e7cbf..6968e8e 100644 +index 37eeb5e..01fb5cf 100644 --- a/src/drivers/driver_nl80211_capa.c +++ b/src/drivers/driver_nl80211_capa.c @@ -78,6 +78,7 @@ struct wiphy_info_data { @@ -55,7 +55,7 @@ index 31e7cbf..6968e8e 100644 } } } -@@ -901,6 +905,9 @@ static int wpa_driver_nl80211_get_info(struct wpa_driver_nl80211_data *drv, +@@ -904,6 +908,9 @@ static int wpa_driver_nl80211_get_info(struct wpa_driver_nl80211_data *drv, drv->capa.max_sched_scan_plan_iterations = 0; } @@ -66,10 +66,10 @@ index 31e7cbf..6968e8e 100644 } diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c -index 09f971c..24a7a28 100644 +index e0ee553..3430c62 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -1410,6 +1410,11 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s, +@@ -1386,6 +1386,11 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s, if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_SAE)) sel &= ~(WPA_KEY_MGMT_SAE | WPA_KEY_MGMT_FT_SAE); #endif /* CONFIG_SAE */ @@ -79,5 +79,5 @@ index 09f971c..24a7a28 100644 + sel &= ~WPA_KEY_MGMT_FT; +#endif /* CONFIG_IEEE80211R */ if (0) { - #ifdef CONFIG_IEEE80211R - #ifdef CONFIG_SHA384 + #ifdef CONFIG_SUITEB192 + } else if (sel & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192) { |