mirror of
https://github.com/openwrt/openwrt.git
synced 2025-03-11 06:54:21 +00:00
395afc4c58
Release 2.11 has been quite a few new features and fixes since the 2.10 release. The following ChangeLog entries highlight some of the main changes: * Wi-Fi Easy Connect - add support for DPP release 3 - allow Configurator parameters to be provided during config exchange * HE/IEEE 802.11ax/Wi-Fi 6 - various fixes * EHT/IEEE 802.11be/Wi-Fi 7 - add preliminary support * SAE: add support for fetching the password from a RADIUS server * support OpenSSL 3.0 API changes * support background radar detection and CAC with some additional drivers * support RADIUS ACL/PSK check during 4-way handshake (wpa_psk_radius=3) * EAP-SIM/AKA: support IMSI privacy * improve 4-way handshake operations - use Secure=1 in message 3 during PTK rekeying ...and many more Remove upstreamed patches: 023-ndisc_snoop-call-dl_list_del-before-freeing-ipv6-add.patch 030-driver_nl80211-rewrite-neigh-code-to-not-depend-on-l.patch 040-mesh-allow-processing-authentication-frames-in-block.patch 181-driver_nl80211-update-drv-ifindex-on-removing-the-fi.patch 182-nl80211-move-nl80211_put_freq_params-call-outside-of.patch 183-hostapd-cancel-channel_list_update_timeout-in-hostap.patch 210-build-de-duplicate-_DIRS-before-calling-mkdir.patch 253-qos_map_set_without_interworking.patch 751-qos_map_ignore_when_unsupported.patch 800-SAE-Check-for-invalid-Rejected-Groups-element-length.patch 801-SAE-Check-for-invalid-Rejected-Groups-element-length.patch 802-SAE-Reject-invalid-Rejected-Groups-element-in-the-pa.patch Other patches has been updated. Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com> Link: https://github.com/openwrt/openwrt/pull/16338 Signed-off-by: Robert Marko <robimarko@gmail.com>
63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
From: David Bauer <mail@david-bauer.net>
|
|
To: hostap@lists.infradead.org
|
|
Cc: =?utf-8?q?=C3=89tienne_Morice?= <neon.emorice@mail.com>
|
|
Subject: [PATCH] nl80211: add extra-ies only if allowed by driver
|
|
Date: Sun, 30 Jan 2022 20:22:00 +0100
|
|
Message-Id: <20220130192200.10883-1-mail@david-bauer.net>
|
|
List-Id: <hostap.lists.infradead.org>
|
|
|
|
Upgrading wpa_supplicant from 2.9 to 2.10 breaks broadcom-wl
|
|
based adapters. The reason for it is hostapd tries to install additional
|
|
IEs for scanning while the driver does not support this.
|
|
|
|
The kernel indicates the maximum number of bytes for additional scan IEs
|
|
using the NL80211_ATTR_MAX_SCAN_IE_LEN attribute. Save this value and
|
|
only add additional scan IEs in case the driver can accommodate these
|
|
additional IEs.
|
|
|
|
Reported-by: Étienne Morice <neon.emorice@mail.com>
|
|
Tested-by: Étienne Morice <neon.emorice@mail.com>
|
|
Signed-off-by: David Bauer <mail@david-bauer.net>
|
|
---
|
|
src/drivers/driver.h | 3 +++
|
|
src/drivers/driver_nl80211_capa.c | 4 ++++
|
|
src/drivers/driver_nl80211_scan.c | 2 +-
|
|
3 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
--- a/src/drivers/driver.h
|
|
+++ b/src/drivers/driver.h
|
|
@@ -2355,6 +2355,9 @@ struct wpa_driver_capa {
|
|
/** Maximum number of iterations in a single scan plan */
|
|
u32 max_sched_scan_plan_iterations;
|
|
|
|
+ /** Maximum number of extra IE bytes for scans */
|
|
+ u16 max_scan_ie_len;
|
|
+
|
|
/** Whether sched_scan (offloaded scanning) is supported */
|
|
int sched_scan_supported;
|
|
|
|
--- a/src/drivers/driver_nl80211_capa.c
|
|
+++ b/src/drivers/driver_nl80211_capa.c
|
|
@@ -976,6 +976,10 @@ static int wiphy_info_handler(struct nl_
|
|
nla_get_u32(tb[NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS]);
|
|
}
|
|
|
|
+ if (tb[NL80211_ATTR_MAX_SCAN_IE_LEN])
|
|
+ capa->max_scan_ie_len =
|
|
+ nla_get_u16(tb[NL80211_ATTR_MAX_SCAN_IE_LEN]);
|
|
+
|
|
if (tb[NL80211_ATTR_MAX_MATCH_SETS])
|
|
capa->max_match_sets =
|
|
nla_get_u8(tb[NL80211_ATTR_MAX_MATCH_SETS]);
|
|
--- a/src/drivers/driver_nl80211_scan.c
|
|
+++ b/src/drivers/driver_nl80211_scan.c
|
|
@@ -221,7 +221,7 @@ nl80211_scan_common(struct i802_bss *bss
|
|
wpa_printf(MSG_DEBUG, "nl80211: Passive scan requested");
|
|
}
|
|
|
|
- if (params->extra_ies) {
|
|
+ if (params->extra_ies && drv->capa.max_scan_ie_len >= params->extra_ies_len) {
|
|
wpa_hexdump(MSG_MSGDUMP, "nl80211: Scan extra IEs",
|
|
params->extra_ies, params->extra_ies_len);
|
|
if (nla_put(msg, NL80211_ATTR_IE, params->extra_ies_len,
|