Merge branch 'openwrt:main' into main

package/kernel/mac80211/patches/ath9k/548-ath9k_enable_gpio_chip.patch

@@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #ifdef CPTCFG_ATH9K_DEBUGFS
 --- a/drivers/net/wireless/ath/ath9k/gpio.c
 +++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -16,13 +16,139 @@
+@@ -16,13 +16,135 @@
 
  #include "ath9k.h"
  #include <linux/ath9k_platform.h>
@@ -127,11 +127,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +	snprintf(gc->label, sizeof(gc->label), "ath9k-%s",
 +		 wiphy_name(sc->hw->wiphy));
 +#ifdef CONFIG_OF
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0)
 +	gc->gchip.parent = sc->dev;
-+#else
-+	gc->gchip.dev = sc->dev;
-+#endif
 +#endif
 +	gc->gchip.label = gc->label;
 +	gc->gchip.base = -1;	/* determine base automatically */
@@ -187,7 +183,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  static void ath_fill_led_pin(struct ath_softc *sc)
  {
  	struct ath_hw *ah = sc->sc_ah;
-@@ -80,6 +206,12 @@ static int ath_add_led(struct ath_softc
+@@ -80,6 +202,12 @@ static int ath_add_led(struct ath_softc
  	else
  		ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
 
@@ -200,7 +196,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	return 0;
  }
 
-@@ -136,17 +268,24 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -136,17 +264,24 @@ void ath_deinit_leds(struct ath_softc *s
 
  	while (!list_empty(&sc->leds)) {
  		led = list_first_entry(&sc->leds, struct ath_led, list);
@@ -225,7 +221,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	char led_name[32];
  	const char *trigger;
  	int i;
-@@ -156,6 +295,15 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -156,6 +291,15 @@ void ath_init_leds(struct ath_softc *sc)
  	if (AR_SREV_9100(sc->sc_ah))
  		return;
 
@@ -241,7 +237,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	ath_fill_led_pin(sc);
 
  	if (pdata && pdata->leds && pdata->num_leds)
-@@ -180,6 +328,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -180,6 +324,7 @@ void ath_init_leds(struct ath_softc *sc)
  	ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
  			   !sc->sc_ah->config.led_active_high);
  }

package/kernel/mac80211/patches/ath9k/549-ath9k_enable_gpio_buttons.patch

@@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
  #ifdef CPTCFG_MAC80211_LEDS
 
-@@ -133,6 +135,67 @@ static void ath9k_unregister_gpio_chip(s
+@@ -129,6 +131,67 @@ static void ath9k_unregister_gpio_chip(s
  	sc->gpiochip = NULL;
  }
 
@@ -97,7 +97,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #else /* CONFIG_GPIOLIB */
 
  static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
-@@ -143,6 +206,14 @@ static inline void ath9k_unregister_gpio
+@@ -139,6 +202,14 @@ static inline void ath9k_unregister_gpio
  {
  }
 
@@ -112,15 +112,15 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #endif /* CONFIG_GPIOLIB */
 
  /********************************/
-@@ -266,6 +337,7 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -262,6 +333,7 @@ void ath_deinit_leds(struct ath_softc *s
  {
  	struct ath_led *led;
 
 +	ath9k_deinit_buttons(sc);
  	while (!list_empty(&sc->leds)) {
  		led = list_first_entry(&sc->leds, struct ath_led, list);
  #ifdef CONFIG_GPIOLIB
-@@ -305,6 +377,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -301,6 +373,7 @@ void ath_init_leds(struct ath_softc *sc)
  	}
 
  	ath_fill_led_pin(sc);

package/kernel/mac80211/patches/build/120-headers_version_fix.patch

@@ -1,14 +1,3 @@
---- a/backport-include/linux/random.h
-+++ b/backport-include/linux/random.h
-@@ -15,7 +15,7 @@ static inline u16 get_random_u16(void)
- }
- #endif
-
--#if LINUX_VERSION_IS_LESS(6,2,0)
-+#if LINUX_VERSION_IS_LESS(6,1,4)
- static inline u32 __get_random_u32_below(u32 ceil)
- {
- 	/*
 --- a/backport-include/net/dropreason.h
 +++ b/backport-include/net/dropreason.h
 @@ -3,10 +3,9 @@

package/kernel/mac80211/patches/build/235-fix-init_vqs-build-error-on-kernel-6.6.patch

@@ -0,0 +1,30 @@
+--- a/drivers/net/wireless/virtual/mac80211_hwsim.c
++++ b/drivers/net/wireless/virtual/mac80211_hwsim.c
+@@ -6629,6 +6629,7 @@ static void hwsim_virtio_rx_done(struct
+
+ static int init_vqs(struct virtio_device *vdev)
+ {
++#if LINUX_VERSION_IS_GEQ(6,11,0)
+ 	struct virtqueue_info vqs_info[HWSIM_NUM_VQS] = {
+ 		[HWSIM_VQ_TX] = { "tx", hwsim_virtio_tx_done },
+ 		[HWSIM_VQ_RX] = { "rx", hwsim_virtio_rx_done },
+@@ -6636,6 +6637,19 @@ static int init_vqs(struct virtio_device
+
+ 	return virtio_find_vqs(vdev, HWSIM_NUM_VQS,
+ 			       hwsim_vqs, vqs_info, NULL);
++#else /* Using the old ABI, copied from kernel 6.6 */
++	vq_callback_t *callbacks[HWSIM_NUM_VQS] = {
++		[HWSIM_VQ_TX] = hwsim_virtio_tx_done,
++		[HWSIM_VQ_RX] = hwsim_virtio_rx_done,
++	};
++	const char *names[HWSIM_NUM_VQS] = {
++		[HWSIM_VQ_TX] = "tx",
++		[HWSIM_VQ_RX] = "rx",
++	};
++
++	return virtio_find_vqs(vdev, HWSIM_NUM_VQS,
++			       hwsim_vqs, callbacks, names, NULL);
++#endif
+ }
+
+ static int fill_vq(struct virtqueue *vq)

package/kernel/mac80211/patches/subsys/301-mac80211-sta-randomize-BA-session-dialog-token-alloc.patch

@@ -28,15 +28,11 @@ Signed-off-by: Johannes Berg <[email protected]>
 
 --- a/net/mac80211/sta_info.c
 +++ b/net/mac80211/sta_info.c
-@@ -565,6 +565,11 @@ __sta_info_alloc(struct ieee80211_sub_if
+@@ -565,6 +565,7 @@ __sta_info_alloc(struct ieee80211_sub_if
  	spin_lock_init(&sta->ps_lock);
  	INIT_WORK(&sta->drv_deliver_wk, sta_deliver_ps_frames);
  	wiphy_work_init(&sta->ampdu_mlme.work, ieee80211_ba_session_work);
-+#if LINUX_VERSION_IS_LESS(6,2,0)
-+	sta->ampdu_mlme.dialog_token_allocator = prandom_u32_max(U8_MAX);
-+#else
 +	sta->ampdu_mlme.dialog_token_allocator = get_random_u32_below(U8_MAX);
-+#endif
  #ifdef CPTCFG_MAC80211_MESH
  	if (ieee80211_vif_is_mesh(&sdata->vif)) {
  		sta->mesh = kzalloc(sizeof(*sta->mesh), gfp);

package/kernel/mac80211/patches/subsys/330-mac80211-add-AQL-support-for-broadcast-packets.patch

@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  		spin_lock_init(&local->active_txq_lock[i]);
 --- a/net/mac80211/sta_info.c
 +++ b/net/mac80211/sta_info.c
-@@ -2357,13 +2357,28 @@ EXPORT_SYMBOL(ieee80211_sta_recalc_aggre
+@@ -2353,13 +2353,28 @@ EXPORT_SYMBOL(ieee80211_sta_recalc_aggre
 
  void ieee80211_sta_update_pending_airtime(struct ieee80211_local *local,
  					  struct sta_info *sta, u8 ac,

package/kernel/mac80211/patches/subsys/780-avoid-crashing-missing-band.patch

@@ -18,7 +18,7 @@ Signed-off-by: David Bauer <[email protected]>
 
 --- a/net/mac80211/sta_info.c
 +++ b/net/mac80211/sta_info.c
-@@ -2459,6 +2459,13 @@ static void sta_stats_decode_rate(struct
+@@ -2455,6 +2455,13 @@ static void sta_stats_decode_rate(struct
 
  		sband = local->hw.wiphy->bands[band];
 

target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch

@@ -867,7 +867,7 @@ SVN-Revision: 35130
  	    iph->daddr == iph2->daddr && iph->saddr == iph2->saddr)
  		return segs;
 
-@@ -258,7 +258,7 @@ struct sk_buff *tcp_gro_lookup(struct li
+@@ -264,7 +264,7 @@ struct sk_buff *tcp_gro_lookup(struct li
  			continue;
 
  		th2 = tcp_hdr(p);
@@ -876,7 +876,7 @@ SVN-Revision: 35130
  			NAPI_GRO_CB(p)->same_flow = 0;
  			continue;
  		}
-@@ -324,8 +324,8 @@ struct sk_buff *tcp_gro_receive(struct l
+@@ -330,8 +330,8 @@ struct sk_buff *tcp_gro_receive(struct l
  		  ~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH));
  	flush |= (__force int)(th->ack_seq ^ th2->ack_seq);
  	for (i = sizeof(*th); i < thlen; i += 4)

target/linux/mediatek/Makefile

@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 ARCH:=arm
 BOARD:=mediatek
-BOARDNAME:=MediaTek Ralink ARM
+BOARDNAME:=MediaTek ARM
 SUBTARGETS:=mt7622 mt7623 mt7629 filogic
 FEATURES:=dt-overlay emmc fpu gpio nand pci pcie rootfs-part separate_ramdisk squashfs usb