[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

include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .60
-LINUX_KERNEL_HASH-5.15.60 = 2d9545f7c96faffd8407522011b9533adefd1360118494dfb6c862f2f15e237a
+LINUX_VERSION-5.15 = .62
+LINUX_KERNEL_HASH-5.15.62 = 06817cde8e57cdb6dbf20eaa5122fee110024f6e8b783799c98cb65dc753f141

include/kernel-5.19

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.19 = .3
-LINUX_KERNEL_HASH-5.19.3 = 513bd672066f5fb22e5739aae3eed60c75c4accc9ba365d1060c4e4225442721
+LINUX_VERSION-5.19 = .4
+LINUX_KERNEL_HASH-5.19.4 = a9214b97085af98dfcaaa8c2e8eff4858c1d53dccd6c58931cf7b0455ff9bf87

package/firmware/ath11k-firmware/Makefile

@@ -47,6 +47,11 @@ $(Package/ath11k-firmware-default)
   TITLE:=ath11k firmware for QCN9074 devices
 endef
 
+define Package/ath11k-firmware-wcn6855
+$(Package/ath11k-firmware-default)
+  TITLE:=ath11k firmware for WCN6855 devices
+endef
+
 define Build/Compile
 
 endef
@@ -87,7 +92,22 @@ define Package/ath11k-firmware-qcn9074/install
 		$(1)/lib/firmware/ath11k/QCN9074/hw1.0/
 endef
 
+define Package/ath11k-firmware-wcn6855/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/WCN6855/hw2.0
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/WCN6855/hw2.0/1.1/WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.7/* \
+		$(1)/lib/firmware/ath11k/WCN6855/hw2.0/
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/WCN6855/hw2.0/board-2.bin \
+		$(1)/lib/firmware/ath11k/WCN6855/hw2.0/board-2.bin
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/WCN6855/hw2.0/regdb.bin \
+		$(1)/lib/firmware/ath11k/WCN6855/hw2.0/regdb.bin
+	$(LN) $(1)/lib/firmware/ath11k/WCN6855/hw2.0 $(1)/lib/firmware/ath11k/WCN6855/hw2.1
+endef
+
 $(eval $(call BuildPackage,ath11k-firmware-ipq6018))
 $(eval $(call BuildPackage,ath11k-firmware-ipq8074))
 $(eval $(call BuildPackage,ath11k-firmware-qca6390))
 $(eval $(call BuildPackage,ath11k-firmware-qcn9074))
+$(eval $(call BuildPackage,ath11k-firmware-wcn6855))

package/kernel/linux/modules/netsupport.mk

@@ -1334,7 +1334,7 @@ define KernelPackage/qrtr
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Qualcomm IPC Router support
   HIDDEN:=1
-  DEPENDS:=@LINUX_5_15
+  DEPENDS:=@(LINUX_5_15||LINUX_5_19)
   KCONFIG:=CONFIG_QRTR
   FILES:= \
   $(LINUX_DIR)/net/qrtr/qrtr.ko \

package/kernel/linux/modules/other.mk

@@ -1298,12 +1298,14 @@ $(eval $(call KernelPackage,qcom-qmi-helpers))
 define KernelPackage/mhi
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Modem Host Interface (MHI) bus
-  DEPENDS:=@LINUX_5_15
+  DEPENDS:=@(LINUX_5_15||LINUX_5_19)
   KCONFIG:=CONFIG_MHI_BUS \
            CONFIG_MHI_BUS_DEBUG=y \
            CONFIG_MHI_BUS_PCI_GENERIC=n \
            CONFIG_MHI_NET=n
-  FILES:=$(LINUX_DIR)/drivers/bus/mhi/core/mhi.ko
+  FILES:= \
+      $(LINUX_DIR)/drivers/bus/mhi/core/[email protected]  \
+      $(LINUX_DIR)/drivers/bus/mhi/host/[email protected]
   AUTOLOAD:=$(call AutoProbe,mhi)
 endef
 

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

@@ -1,10 +1,11 @@
 diff -ru a/src/ap/hw_features.c b/src/ap/hw_features.c
 --- a/src/ap/hw_features.c	2022-01-16 15:51:29.000000000 -0500
 +++ b/src/ap/hw_features.c	2022-07-06 22:57:53.007315518 -0500
-@@ -26,6 +26,17 @@
+@@ -24,6 +24,19 @@
  #include "beacon.h"
  #include "hw_features.h"
 
++#ifdef CONFIG_IWLWIFI
 +static void ieee80211n_do_nothing(struct hostapd_iface *iface)
 +{
 +			wpa_printf(MSG_DEBUG,
@@ -16,13 +17,15 @@ diff -ru a/src/ap/hw_features.c b/src/ap/hw_features.c
 +static void ieee80211n_scan_channels_5g(struct hostapd_iface *iface,
 +					struct wpa_driver_scan_params *params);
 +
++#endif
 
  void hostapd_free_hw_features(struct hostapd_hw_modes *hw_features,
  			      size_t num_hw_features)
-@@ -82,6 +93,33 @@
+@@ -82,6 +93,35 @@
 
  	if (hostapd_drv_none(hapd))
  		return -1;
++#ifdef CONFIG_IWLWIFI
 +
 +
 +	if (!iface->conf->noscan) { 
@@ -50,37 +53,35 @@ diff -ru a/src/ap/hw_features.c b/src/ap/hw_features.c
 +                }
 +        } 
 +	}
++#endif
  	modes = hostapd_get_hw_feature_data(hapd, &num_modes, &flags,
  					    &dfs_domain);
  	if (modes == NULL) {
-
-@@ -308,7 +346,6 @@
- 			       sec_chan);
- }
-
--
- static void ieee80211n_check_scan(struct hostapd_iface *iface)
- {
- 	struct wpa_scan_results *scan_res;
-@@ -517,8 +554,10 @@
- 	int ret;
+@@ -518,8 +556,15 @@
 
  	/* Check that HT40 is used and PRI / SEC switch is allowed */
--	if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch)
-+	if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch || iface->conf->noscan) {
+ 	if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch ||
++#ifdef CONFIG_IWLWIFI
++		iface->conf->noscan) {
 +                wpa_printf(MSG_DEBUG, "Not scanning due to noscan?");
++		return 0;
++	}
++#else
+ 		iface->conf->noscan)
  		return 0;
-+        }
++#endif
 
  	hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
  	wpa_printf(MSG_DEBUG, "Scan for neighboring BSSes prior to enabling "
-@@ -916,7 +954,7 @@
+@@ -916,7 +954,11 @@
  	if (!hostapd_is_usable_edmg(iface))
  		return 0;
 
--	if (!iface->conf->secondary_channel)
++#ifdef CONFIG_IWLWIFI
 +	if (!iface->conf->secondary_channel || iface->conf->noscan)
++#else
+ 	if (!iface->conf->secondary_channel)
++#endif
  		return 1;
 
  	if (hostapd_is_usable_chan(iface, iface->freq +
-

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

@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <[email protected]>
 
  #include "gpiolib.h"
  #include "gpiolib-of.h"
-@@ -1057,3 +1059,72 @@ void of_gpio_dev_init(struct gpio_chip *
+@@ -1059,3 +1061,72 @@ void of_gpio_dev_init(struct gpio_chip *
  	else
  		gc->of_node = gdev->dev.of_node;
  }

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

@@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +MODULE_LICENSE("GPL");
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -4175,6 +4175,7 @@ int wake_up_state(struct task_struct *p,
+@@ -4184,6 +4184,7 @@ int wake_up_state(struct task_struct *p,
  {
  	return try_to_wake_up(p, state, 0);
  }

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

@@ -148,7 +148,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	buf_printf(b, "\n");
  	buf_printf(b, "__visible struct module __this_module\n");
  	buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n");
-@@ -2285,11 +2289,13 @@ static void add_depends(struct buffer *b
+@@ -2283,11 +2287,13 @@ static void add_depends(struct buffer *b
 
  static void add_srcversion(struct buffer *b, struct module *mod)
  {
@@ -162,7 +162,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  }
 
  static void write_buf(struct buffer *b, const char *fname)
-@@ -2375,7 +2381,9 @@ static void write_mod_c_file(struct modu
+@@ -2373,7 +2379,9 @@ static void write_mod_c_file(struct modu
  	add_exported_symbols(&buf, mod);
  	add_versions(&buf, mod);
  	add_depends(&buf, mod);

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

@@ -16,7 +16,7 @@ Signed-off-by: Alexandros C. Couloumbis <[email protected]>
 
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
-@@ -59,19 +59,6 @@ machine-$(CONFIG_PPC64) += 64
+@@ -42,19 +42,6 @@ machine-$(CONFIG_PPC64) += 64
  machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le
  UTS_MACHINE := $(subst $(space),,$(machine-y))
 

target/linux/generic/pending-5.15/420-mtd-redboot_space.patch

@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/drivers/mtd/parsers/redboot.c
 +++ b/drivers/mtd/parsers/redboot.c
-@@ -277,14 +277,21 @@ nogood:
+@@ -278,14 +278,21 @@ nogood:
  #endif
  		names += strlen(names) + 1;
 

target/linux/generic/pending-5.15/811-pci_disable_usb_common_quirks.patch

@@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */
 --- a/include/linux/usb/hcd.h
 +++ b/include/linux/usb/hcd.h
-@@ -497,7 +497,14 @@ extern int usb_hcd_pci_probe(struct pci_
+@@ -498,7 +498,14 @@ extern int usb_hcd_pci_probe(struct pci_
  extern void usb_hcd_pci_remove(struct pci_dev *dev);
  extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
 

target/linux/generic/pending-5.15/920-mangle_bootargs.patch

@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
  	help
 --- a/init/main.c
 +++ b/init/main.c
-@@ -615,6 +615,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -616,6 +616,29 @@ static inline void setup_nr_cpu_ids(void
  static inline void smp_prepare_cpus(unsigned int maxcpus) { }
  #endif
 
@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
  /*
   * We need to store the untouched command line for future reference.
   * We also need to store the touched command line since the parameter
-@@ -955,6 +978,7 @@ asmlinkage __visible void __init __no_sa
+@@ -956,6 +979,7 @@ asmlinkage __visible void __init __no_sa
  	pr_notice("%s", linux_banner);
  	early_security_init();
  	setup_arch(&command_line);

target/linux/generic/pending-5.19/703-phy-add-detach-callback-to-struct-phy_driver.patch

@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
 
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1738,6 +1738,9 @@ void phy_detach(struct phy_device *phyde
+@@ -1744,6 +1744,9 @@ void phy_detach(struct phy_device *phyde
  	struct module *ndev_owner = NULL;
  	struct mii_bus *bus;
 

target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch

@@ -1,6 +1,6 @@
 --- a/drivers/tty/serial/8250/8250.h
 +++ b/drivers/tty/serial/8250/8250.h
-@@ -83,6 +83,7 @@ struct serial8250_config {
+@@ -85,6 +85,7 @@ struct serial8250_config {
  #define UART_CAP_MINI	BIT(17)	/* Mini UART on BCM283X family lacks:
  					 * STOP PARITY EPAR SPAR WLEN5 WLEN6
  					 */
@@ -19,7 +19,7 @@
  	},
  	[PORT_NPCM] = {
  		.name		= "Nuvoton 16550",
-@@ -2766,6 +2766,11 @@ serial8250_do_set_termios(struct uart_po
+@@ -2745,6 +2745,11 @@ serial8250_do_set_termios(struct uart_po
  	unsigned long flags;
  	unsigned int baud, quot, frac = 0;