Skip to content

Commit d944716

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: hostapd: fix this patch to cause some wireless driver DFS detection (coolsnowwolf#9997) kernel: bump 5.19 to 5.19.4 (coolsnowwolf#9995) kernel: bump 5.15 to 5.15.62 (coolsnowwolf#9994) ath11k: add wcn685x wifi6e ap mode and firmware support
2 parents 5e693fc + 80ea9d5 commit d944716

File tree

15 files changed

+61
-38
lines changed

15 files changed

+61
-38
lines changed

‎include/kernel-5.15

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .60
2-
LINUX_KERNEL_HASH-5.15.60 = 2d9545f7c96faffd8407522011b9533adefd1360118494dfb6c862f2f15e237a
1+
LINUX_VERSION-5.15 = .62
2+
LINUX_KERNEL_HASH-5.15.62 = 06817cde8e57cdb6dbf20eaa5122fee110024f6e8b783799c98cb65dc753f141

‎include/kernel-5.19

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.19 = .3
2-
LINUX_KERNEL_HASH-5.19.3 = 513bd672066f5fb22e5739aae3eed60c75c4accc9ba365d1060c4e4225442721
1+
LINUX_VERSION-5.19 = .4
2+
LINUX_KERNEL_HASH-5.19.4 = a9214b97085af98dfcaaa8c2e8eff4858c1d53dccd6c58931cf7b0455ff9bf87

‎package/firmware/ath11k-firmware/Makefile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ $(Package/ath11k-firmware-default)
4747
TITLE:=ath11k firmware for QCN9074 devices
4848
endef
4949

50+
define Package/ath11k-firmware-wcn6855
51+
$(Package/ath11k-firmware-default)
52+
TITLE:=ath11k firmware for WCN6855 devices
53+
endef
54+
5055
define Build/Compile
5156

5257
endef
@@ -87,7 +92,22 @@ define Package/ath11k-firmware-qcn9074/install
8792
$(1)/lib/firmware/ath11k/QCN9074/hw1.0/
8893
endef
8994

95+
define Package/ath11k-firmware-wcn6855/install
96+
$(INSTALL_DIR) $(1)/lib/firmware/ath11k/WCN6855/hw2.0
97+
$(INSTALL_DATA) \
98+
$(PKG_BUILD_DIR)/WCN6855/hw2.0/1.1/WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.7/* \
99+
$(1)/lib/firmware/ath11k/WCN6855/hw2.0/
100+
$(INSTALL_DATA) \
101+
$(PKG_BUILD_DIR)/WCN6855/hw2.0/board-2.bin \
102+
$(1)/lib/firmware/ath11k/WCN6855/hw2.0/board-2.bin
103+
$(INSTALL_DATA) \
104+
$(PKG_BUILD_DIR)/WCN6855/hw2.0/regdb.bin \
105+
$(1)/lib/firmware/ath11k/WCN6855/hw2.0/regdb.bin
106+
$(LN) $(1)/lib/firmware/ath11k/WCN6855/hw2.0 $(1)/lib/firmware/ath11k/WCN6855/hw2.1
107+
endef
108+
90109
$(eval $(call BuildPackage,ath11k-firmware-ipq6018))
91110
$(eval $(call BuildPackage,ath11k-firmware-ipq8074))
92111
$(eval $(call BuildPackage,ath11k-firmware-qca6390))
93112
$(eval $(call BuildPackage,ath11k-firmware-qcn9074))
113+
$(eval $(call BuildPackage,ath11k-firmware-wcn6855))

‎package/kernel/linux/modules/netsupport.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,7 @@ define KernelPackage/qrtr
13341334
SUBMENU:=$(NETWORK_SUPPORT_MENU)
13351335
TITLE:=Qualcomm IPC Router support
13361336
HIDDEN:=1
1337-
DEPENDS:=@LINUX_5_15
1337+
DEPENDS:=@(LINUX_5_15||LINUX_5_19)
13381338
KCONFIG:=CONFIG_QRTR
13391339
FILES:= \
13401340
$(LINUX_DIR)/net/qrtr/qrtr.ko \

‎package/kernel/linux/modules/other.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,12 +1298,14 @@ $(eval $(call KernelPackage,qcom-qmi-helpers))
12981298
define KernelPackage/mhi
12991299
SUBMENU:=$(OTHER_MENU)
13001300
TITLE:=Modem Host Interface (MHI) bus
1301-
DEPENDS:=@LINUX_5_15
1301+
DEPENDS:=@(LINUX_5_15||LINUX_5_19)
13021302
KCONFIG:=CONFIG_MHI_BUS \
13031303
CONFIG_MHI_BUS_DEBUG=y \
13041304
CONFIG_MHI_BUS_PCI_GENERIC=n \
13051305
CONFIG_MHI_NET=n
1306-
FILES:=$(LINUX_DIR)/drivers/bus/mhi/core/mhi.ko
1306+
FILES:= \
1307+
$(LINUX_DIR)/drivers/bus/mhi/core/[email protected] \
1308+
$(LINUX_DIR)/drivers/bus/mhi/host/[email protected]
13071309
AUTOLOAD:=$(call AutoProbe,mhi)
13081310
endef
13091311

‎package/network/services/hostapd/patches/800-hostapd-2.10-lar.patch

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
diff -ru a/src/ap/hw_features.c b/src/ap/hw_features.c
22
--- a/src/ap/hw_features.c 2022-01-16 15:51:29.000000000 -0500
33
+++ b/src/ap/hw_features.c 2022-07-06 22:57:53.007315518 -0500
4-
@@ -26,6 +26,17 @@
4+
@@ -24,6 +24,19 @@
55
#include "beacon.h"
66
#include "hw_features.h"
77

8+
+#ifdef CONFIG_IWLWIFI
89
+static void ieee80211n_do_nothing(struct hostapd_iface *iface)
910
+{
1011
+ wpa_printf(MSG_DEBUG,
@@ -16,13 +17,15 @@ diff -ru a/src/ap/hw_features.c b/src/ap/hw_features.c
1617
+static void ieee80211n_scan_channels_5g(struct hostapd_iface *iface,
1718
+ struct wpa_driver_scan_params *params);
1819
+
20+
+#endif
1921

2022
void hostapd_free_hw_features(struct hostapd_hw_modes *hw_features,
2123
size_t num_hw_features)
22-
@@ -82,6 +93,33 @@
24+
@@ -82,6 +93,35 @@
2325

2426
if (hostapd_drv_none(hapd))
2527
return -1;
28+
+#ifdef CONFIG_IWLWIFI
2629
+
2730
+
2831
+ if (!iface->conf->noscan) {
@@ -50,37 +53,35 @@ diff -ru a/src/ap/hw_features.c b/src/ap/hw_features.c
5053
+ }
5154
+ }
5255
+ }
56+
+#endif
5357
modes = hostapd_get_hw_feature_data(hapd, &num_modes, &flags,
5458
&dfs_domain);
5559
if (modes == NULL) {
56-
57-
@@ -308,7 +346,6 @@
58-
sec_chan);
59-
}
60-
61-
-
62-
static void ieee80211n_check_scan(struct hostapd_iface *iface)
63-
{
64-
struct wpa_scan_results *scan_res;
65-
@@ -517,8 +554,10 @@
66-
int ret;
60+
@@ -518,8 +556,15 @@
6761

6862
/* Check that HT40 is used and PRI / SEC switch is allowed */
69-
- if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch)
70-
+ if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch || iface->conf->noscan) {
63+
if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch ||
64+
+#ifdef CONFIG_IWLWIFI
65+
+ iface->conf->noscan) {
7166
+ wpa_printf(MSG_DEBUG, "Not scanning due to noscan?");
67+
+ return 0;
68+
+ }
69+
+#else
70+
iface->conf->noscan)
7271
return 0;
73-
+ }
72+
+#endif
7473

7574
hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
7675
wpa_printf(MSG_DEBUG, "Scan for neighboring BSSes prior to enabling "
77-
@@ -916,7 +954,7 @@
76+
@@ -916,7 +954,11 @@
7877
if (!hostapd_is_usable_edmg(iface))
7978
return 0;
8079

81-
- if (!iface->conf->secondary_channel)
80+
+#ifdef CONFIG_IWLWIFI
8281
+ if (!iface->conf->secondary_channel || iface->conf->noscan)
82+
+#else
83+
if (!iface->conf->secondary_channel)
84+
+#endif
8385
return 1;
8486

8587
if (hostapd_is_usable_chan(iface, iface->freq +
86-

‎target/linux/generic/hack-5.15/800-GPIO-add-named-gpio-exports.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <[email protected]>
1515

1616
#include "gpiolib.h"
1717
#include "gpiolib-of.h"
18-
@@ -1057,3 +1059,72 @@ void of_gpio_dev_init(struct gpio_chip *
18+
@@ -1059,3 +1061,72 @@ void of_gpio_dev_init(struct gpio_chip *
1919
else
2020
gc->of_node = gdev->dev.of_node;
2121
}

‎target/linux/generic/hack-5.15/904-debloat_dma_buf.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
7272
+MODULE_LICENSE("GPL");
7373
--- a/kernel/sched/core.c
7474
+++ b/kernel/sched/core.c
75-
@@ -4175,6 +4175,7 @@ int wake_up_state(struct task_struct *p,
75+
@@ -4184,6 +4184,7 @@ int wake_up_state(struct task_struct *p,
7676
{
7777
return try_to_wake_up(p, state, 0);
7878
}

‎target/linux/generic/hack-5.19/204-module_strip.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
148148
buf_printf(b, "\n");
149149
buf_printf(b, "__visible struct module __this_module\n");
150150
buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n");
151-
@@ -2285,11 +2289,13 @@ static void add_depends(struct buffer *b
151+
@@ -2283,11 +2287,13 @@ static void add_depends(struct buffer *b
152152

153153
static void add_srcversion(struct buffer *b, struct module *mod)
154154
{
@@ -162,7 +162,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
162162
}
163163

164164
static void write_buf(struct buffer *b, const char *fname)
165-
@@ -2375,7 +2381,9 @@ static void write_mod_c_file(struct modu
165+
@@ -2373,7 +2379,9 @@ static void write_mod_c_file(struct modu
166166
add_exported_symbols(&buf, mod);
167167
add_versions(&buf, mod);
168168
add_depends(&buf, mod);

‎target/linux/generic/hack-5.19/321-powerpc_crtsavres_prereq.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Signed-off-by: Alexandros C. Couloumbis <[email protected]>
1616

1717
--- a/arch/powerpc/Makefile
1818
+++ b/arch/powerpc/Makefile
19-
@@ -59,19 +59,6 @@ machine-$(CONFIG_PPC64) += 64
19+
@@ -42,19 +42,6 @@ machine-$(CONFIG_PPC64) += 64
2020
machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le
2121
UTS_MACHINE := $(subst $(space),,$(machine-y))
2222

0 commit comments

Comments
 (0)