From 5f42e9db58194fd82c8ee3244cb07db935a45b52 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 28 Mar 2025 08:04:28 +0100 Subject: [PATCH] mac80211: AP VLAN interfaces did not inheret the HE capabilities correctly Fixes: WIFI-14491 Signed-off-by: John Crispin --- .../patches/pending/a-100-fix-ap-vlan-he-capab.patch | 12 ++++++++++++ feeds/qca-wifi-7/ipq53xx/config-6.1 | 6 +++++- feeds/qca-wifi-7/ipq95xx/config-6.1 | 2 +- .../pending/a-100-fix-ap-vlan-he-capab.patch | 12 ++++++++++++ feeds/ucentral/ucentral-schema/Makefile | 2 +- 5 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 feeds/ipq807x_v5.4/mac80211/patches/pending/a-100-fix-ap-vlan-he-capab.patch create mode 100644 feeds/qca-wifi-7/mac80211/patches-tip/pending/a-100-fix-ap-vlan-he-capab.patch diff --git a/feeds/ipq807x_v5.4/mac80211/patches/pending/a-100-fix-ap-vlan-he-capab.patch b/feeds/ipq807x_v5.4/mac80211/patches/pending/a-100-fix-ap-vlan-he-capab.patch new file mode 100644 index 000000000..436b099ea --- /dev/null +++ b/feeds/ipq807x_v5.4/mac80211/patches/pending/a-100-fix-ap-vlan-he-capab.patch @@ -0,0 +1,12 @@ +--- a/include/net/cfg80211.h ++++ b/include/net/cfg80211.h +@@ -543,6 +543,9 @@ ieee80211_get_sband_iftype_data(const st + if (WARN_ON(iftype >= NL80211_IFTYPE_MAX)) + return NULL; + ++ if (iftype == NL80211_IFTYPE_AP_VLAN) ++ iftype = NL80211_IFTYPE_AP; ++ + for (i = 0; i < sband->n_iftype_data; i++) { + const struct ieee80211_sband_iftype_data *data = + &sband->iftype_data[i]; diff --git a/feeds/qca-wifi-7/ipq53xx/config-6.1 b/feeds/qca-wifi-7/ipq53xx/config-6.1 index 3cfa7ea38..7c03d9e3c 100755 --- a/feeds/qca-wifi-7/ipq53xx/config-6.1 +++ b/feeds/qca-wifi-7/ipq53xx/config-6.1 @@ -845,7 +845,7 @@ CONFIG_QCOM_RPM_CLK=y # CONFIG_QCOM_RTB is not set CONFIG_QCOM_SCM=y CONFIG_QCOM_SCM_32=y -CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT=y +CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT=n # CONFIG_QCOM_SMD is not set # CONFIG_QCOM_SMD_RPM is not set CONFIG_QCOM_SMEM=y @@ -1219,3 +1219,7 @@ CONFIG_ARM_PMU=y CONFIG_REALTEK_PHY=y CONFIG_RTK_MSSDK_PHY=y CONFIG_LEDS_PWM=y +CONFIG_PSTORE=y +CONFIG_PSTORE_CONSOLE=y +CONFIG_PSTORE_PMSG=y +CONFIG_PSTORE_RAM=y diff --git a/feeds/qca-wifi-7/ipq95xx/config-6.1 b/feeds/qca-wifi-7/ipq95xx/config-6.1 index b0a1fbf69..01fe8771f 100644 --- a/feeds/qca-wifi-7/ipq95xx/config-6.1 +++ b/feeds/qca-wifi-7/ipq95xx/config-6.1 @@ -857,7 +857,7 @@ CONFIG_QCOM_RPM_CLK=y # CONFIG_QCOM_RTB is not set CONFIG_QCOM_SCM=y CONFIG_QCOM_SCM_32=y -CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT=y +CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT=n # CONFIG_QCOM_SMD is not set CONFIG_QCOM_SMD_RPM=y CONFIG_QCOM_SMEM=y diff --git a/feeds/qca-wifi-7/mac80211/patches-tip/pending/a-100-fix-ap-vlan-he-capab.patch b/feeds/qca-wifi-7/mac80211/patches-tip/pending/a-100-fix-ap-vlan-he-capab.patch new file mode 100644 index 000000000..9c2eb8558 --- /dev/null +++ b/feeds/qca-wifi-7/mac80211/patches-tip/pending/a-100-fix-ap-vlan-he-capab.patch @@ -0,0 +1,12 @@ +--- a/include/net/cfg80211.h ++++ b/include/net/cfg80211.h +@@ -594,6 +594,9 @@ ieee80211_get_sband_iftype_data(const st + if (WARN_ON(iftype >= NL80211_IFTYPE_MAX)) + return NULL; + ++ if (iftype == NL80211_IFTYPE_AP_VLAN) ++ iftype = NL80211_IFTYPE_AP; ++ + for (i = 0; i < sband->n_iftype_data; i++) { + const struct ieee80211_sband_iftype_data *data = + &sband->iftype_data[i]; diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile index 9b0f2bdaa..3bcbafe18 100644 --- a/feeds/ucentral/ucentral-schema/Makefile +++ b/feeds/ucentral/ucentral-schema/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2025-01-27 -PKG_SOURCE_VERSION:=d183922b77bbef5f9e17a8141c7496839f8f8898 +PKG_SOURCE_VERSION:=601bdd6063276e3e158a6c8438232adf298a53f0 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=BSD-3-Clause