patches/lede/0087-ar71xx-add-support-for-GL.iNet-GL-AR750.patch

-From: Piotr Dymacz <pepe2k@gmail.com>
-Date: Tue, 17 Oct 2017 23:30:01 +0200
-Subject: ar71xx: add support for GL.iNet GL-AR750
-
-GL.iNet GL-AR750 is a small size, dual-band (AC750) router, based on
-Qualcomm/Atheros QCA9531 v2 + QCA9887. FCC ID: 2AFIW-AR750.
-
-Specification:
-
-- 650/597/216 MHz (CPU/DDR/AHB)
-- 128 MB of RAM (DDR2)
-- 16 MB of FLASH (SPI NOR)
-- 3x 10/100 Mbps Ethernet
-- 2T2R 2.4 GHz (QCA9531)
-- 1T1R 5 GHz (QCA9887)
-- 1x USB 2.0 (power controlled by GPIO)
-- 1x microSD (GL857L)
-- 3x LED (all driven by GPIO)
-- 1x button (reset)
-- 1x 2-pos switch
-- header for optional PoE module
-- 1x micro USB for main power input
-- UART + I2C header on PCB
-
-Flash instruction:
-
-Vendor firmware is based on OpenWrt/LEDE. GUI or sysupgrade can be used
-to flash OpenWrt/LEDE firmware.
-
-Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
-
-diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds
-index f4d83cee519406a188cc9dde355f509dd644625a..f94cc3c85b798458cc97c06bb0d44bdc426d057d 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
-@@ -314,6 +314,10 @@ fritz4020)
- gl-ar300m)
- 	ucidef_set_led_wlan "wlan" "WLAN" "$board:red:wlan" "phy0tpt"
- 	;;
-+gl-ar750)
-+	ucidef_set_led_wlan "wlan2g" "WLAN2G" "$board:white:wlan2g" "phy1tpt"
-+	ucidef_set_led_wlan "wlan5g" "WLAN5G" "$board:white:wlan5g" "phy0tpt"
-+	;;
- gl-mifi)
- 	ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
- 	ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth0"
-diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
-index ae82cfe008169a8282ac51746cf2299eec8c81d8..c8990c60f504286d0fd28c7b17f54c9c3b5a891e 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/02_network
-+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
-@@ -369,6 +369,7 @@ ar71xx_setup_interfaces()
- 	onion-omega)
- 		ucidef_set_interface_lan "wlan0"
- 		;;
-+	gl-ar750|\
- 	rb-435g)
- 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
- 		ucidef_add_switch "switch0" \
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index 336d078f72a06073e3465c36ca98035c7d70282f..01d3b787bedcab82a5797c9a4801e8139887cc2c 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -249,6 +249,7 @@ get_status_led() {
- 	nbg460n_550n_550nh)
- 		status_led="nbg460n:green:power"
- 		;;
-+	gl-ar750|\
- 	nbg6716)
- 		status_led="$board:white:power"
- 		;;
-@@ -489,7 +490,8 @@ set_state() {
- 	done)
- 		status_led_on
- 		case $(ar71xx_board_name) in
--		gl-ar300m)
-+		gl-ar300m|\
-+		gl-ar750)
- 			fw_printenv lc >/dev/null 2>&1 && fw_setenv "bootcount" 0
- 			;;
- 		qihoo-c301)
-diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 91bdf0d3c591516f58030b165052b3dd2751314f..1626622a8e46484bbf2719f19843e61d9cc92506 100644
---- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -103,6 +103,7 @@ case "$FIRMWARE" in
- 		ath10kcal_extract "art" 20480 2116
- 		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2)
- 		;;
-+	gl-ar750|\
- 	tl-wpa8630)
- 		ath10kcal_extract "art" 20480 2116
- 		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1)
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 21b1c44404d383ef99860caf95a8e19b9cbf5087..35b742a5f1fee0bc24ab2d88e32f118c1df4e2b3 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -650,6 +650,9 @@ ar71xx_board_detect() {
- 	*"GL-AR300M")
- 		name="gl-ar300m"
- 		;;
-+	*"GL-AR750")
-+		name="gl-ar750"
-+		;;
- 	*"GL-MIFI")
- 		name="gl-mifi"
- 		;;
-diff --git a/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
-index d677599d8c6380d9920e95abc9fb4b92cc0cec29..ba6e08b00d979bc73f7199756e22ca3941fad97d 100644
---- a/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
-+++ b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
-@@ -17,6 +17,7 @@ set_preinit_iface() {
- 	archer-c7 |\
- 	bhr-4grv2 |\
- 	dir-505-a1 |\
-+	gl-ar750|\
- 	gl-inet |\
- 	jwap003 |\
- 	pb42 |\
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index 03677ad1240c9a5af341354b95561f9d493a9cd8..236520b27c4d6d0b1b7e483d1100fb5ab156d475 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -253,6 +253,7 @@ platform_check_image() {
- 	gl-ar150|\
- 	gl-ar300m|\
- 	gl-ar300|\
-+	gl-ar750|\
- 	gl-domino|\
- 	gl-mifi|\
- 	hiwifi-hc6361|\
-diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
-index 45bf500643837a7270b45e32b22225c06c5fb841..d96642b97c36187febb1f3843e7dd9acfab0e40d 100644
---- a/target/linux/ar71xx/config-4.4
-+++ b/target/linux/ar71xx/config-4.4
-@@ -110,6 +110,7 @@ CONFIG_ATH79_MACH_FRITZ4020=y
- CONFIG_ATH79_MACH_GL_AR150=y
- CONFIG_ATH79_MACH_GL_AR300=y
- CONFIG_ATH79_MACH_GL_AR300M=y
-+CONFIG_ATH79_MACH_GL_AR750=y
- CONFIG_ATH79_MACH_GL_DOMINO=y
- CONFIG_ATH79_MACH_GL_INET=y
- CONFIG_ATH79_MACH_GL_MIFI=y
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-index 46366e0d922808e5e14fed0f2b5409cda11afd26..2449a8d6bce17f0a703d8fc4f82dd38e1f861ae3 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
-@@ -691,6 +691,17 @@ config ATH79_MACH_GL_AR300M
- 	select ATH79_DEV_USB
- 	select ATH79_DEV_WMAC
- 
-+config ATH79_MACH_GL_AR750
-+	bool "GL.iNet GL-AR750 support"
-+	select SOC_QCA953X
-+	select ATH79_DEV_AP9X_PCI if PCI
-+	select ATH79_DEV_ETH
-+	select ATH79_DEV_GPIO_BUTTONS
-+	select ATH79_DEV_LEDS_GPIO
-+	select ATH79_DEV_M25P80
-+	select ATH79_DEV_USB
-+	select ATH79_DEV_WMAC
-+
- config ATH79_MACH_GL_DOMINO
- 	bool "DOMINO support"
- 	select SOC_AR933X
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-index 29c9c65bc122c0d02839adf1abb61dcda0795fb6..98281db31a05713168713f3e0fd62f736a2e7614 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
-@@ -115,6 +115,7 @@ obj-$(CONFIG_ATH79_MACH_FRITZ4020)		+= mach-fritz4020.o
- obj-$(CONFIG_ATH79_MACH_GL_AR150)		+= mach-gl-ar150.o
- obj-$(CONFIG_ATH79_MACH_GL_AR300)		+= mach-gl-ar300.o
- obj-$(CONFIG_ATH79_MACH_GL_AR300M)		+= mach-gl-ar300m.o
-+obj-$(CONFIG_ATH79_MACH_GL_AR750)		+= mach-gl-ar750.o
- obj-$(CONFIG_ATH79_MACH_GL_DOMINO)		+= mach-gl-domino.o
- obj-$(CONFIG_ATH79_MACH_GL_INET)		+= mach-gl-inet.o
- obj-$(CONFIG_ATH79_MACH_GL_MIFI)		+= mach-gl-mifi.o
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar750.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar750.c
-new file mode 100644
-index 0000000000000000000000000000000000000000..9ee6e29c02139b972a83a555fcd693765bf8194f
---- /dev/null
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar750.c
-@@ -0,0 +1,146 @@
-+/*
-+ * GL.iNet GL-AR750 board support
-+ *
-+ * Copyright (C) 2018 Piotr Dymacz <pepe2k@gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include <linux/gpio.h>
-+#include <linux/i2c.h>
-+#include <linux/i2c-gpio.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/mach-ath79/ath79.h>
-+#include <asm/mach-ath79/ar71xx_regs.h>
-+
-+#include "common.h"
-+#include "dev-ap9x-pci.h"
-+#include "dev-eth.h"
-+#include "dev-gpio-buttons.h"
-+#include "dev-leds-gpio.h"
-+#include "dev-m25p80.h"
-+#include "dev-usb.h"
-+#include "dev-wmac.h"
-+#include "machtypes.h"
-+
-+#define GL_AR750_GPIO_LED_POWER		12
-+#define GL_AR750_GPIO_LED_WLAN2G	14
-+#define GL_AR750_GPIO_LED_WLAN5G	13
-+
-+#define GL_AR750_GPIO_BTN_RESET		3
-+#define GL_AR750_GPIO_BTN_SW1		0
-+
-+#define GL_AR750_GPIO_I2C_SCL		16
-+#define GL_AR750_GPIO_I2C_SDA		17
-+
-+#define GL_AR750_GPIO_USB_POWER		2
-+
-+#define GL_AR750_KEYS_POLL_INTERVAL	20
-+#define GL_AR750_KEYS_DEBOUNCE_INTERVAL	(3 * GL_AR750_KEYS_POLL_INTERVAL)
-+
-+#define GL_AR750_MAC0_OFFSET		0
-+#define GL_AR750_WMAC2G_CALDATA_OFFSET	0x1000
-+#define GL_AR750_WMAC5G_CALDATA_OFFSET	0x5000
-+
-+static struct gpio_led gl_ar750_leds_gpio[] __initdata = {
-+	{
-+		.name		= "gl-ar750:white:power",
-+		.gpio		= GL_AR750_GPIO_LED_POWER,
-+		.default_state	= LEDS_GPIO_DEFSTATE_KEEP,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "gl-ar750:white:wlan2g",
-+		.gpio		= GL_AR750_GPIO_LED_WLAN2G,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "gl-ar750:white:wlan5g",
-+		.gpio		= GL_AR750_GPIO_LED_WLAN5G,
-+		.active_low	= 1,
-+	},
-+};
-+
-+static struct gpio_keys_button gl_ar750_gpio_keys[] __initdata = {
-+	{
-+		.desc			= "reset",
-+		.type			= EV_KEY,
-+		.code			= KEY_RESTART,
-+		.debounce_interval	= GL_AR750_KEYS_DEBOUNCE_INTERVAL,
-+		.gpio			= GL_AR750_GPIO_BTN_RESET,
-+		.active_low		= 1,
-+	}, {
-+		.desc			= "sw1",
-+		.type			= EV_KEY,
-+		.code			= BTN_0,
-+		.debounce_interval	= GL_AR750_KEYS_DEBOUNCE_INTERVAL,
-+		.gpio			= GL_AR750_GPIO_BTN_SW1,
-+		.active_low		= 1,
-+	},
-+};
-+
-+static struct i2c_gpio_platform_data gl_ar750_i2c_gpio_data = {
-+	.sda_pin = GL_AR750_GPIO_I2C_SDA,
-+	.scl_pin = GL_AR750_GPIO_I2C_SCL,
-+};
-+
-+static struct platform_device gl_ar750_i2c_gpio = {
-+	.name	= "i2c-gpio",
-+	.id	= 0,
-+	.dev	= {
-+		.platform_data = &gl_ar750_i2c_gpio_data,
-+	},
-+};
-+
-+static void __init gl_ar750_setup(void)
-+{
-+	u8 *art = (u8 *) KSEG1ADDR(0x1f050000);
-+
-+	ath79_register_m25p80(NULL);
-+
-+	ath79_setup_ar933x_phy4_switch(false, false);
-+	ath79_register_mdio(0, 0x0);
-+
-+	ath79_switch_data.phy4_mii_en = 1;
-+	ath79_switch_data.phy_poll_mask = 0xfc;
-+
-+	/* WAN */
-+	ath79_eth0_data.duplex = DUPLEX_FULL;
-+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
-+	ath79_eth0_data.phy_mask = BIT(4);
-+	ath79_eth0_data.speed = SPEED_100;
-+	ath79_init_mac(ath79_eth0_data.mac_addr, art + GL_AR750_MAC0_OFFSET, 0);
-+	ath79_register_eth(0);
-+
-+	/* LAN */
-+	ath79_eth1_data.duplex = DUPLEX_FULL;
-+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
-+	ath79_init_mac(ath79_eth1_data.mac_addr, art + GL_AR750_MAC0_OFFSET, 1);
-+	ath79_register_eth(1);
-+
-+	/* Disable JTAG (enables GPIO0-3) */
-+	ath79_gpio_function_enable(AR934X_GPIO_FUNC_JTAG_DISABLE);
-+
-+	ath79_register_leds_gpio(-1, ARRAY_SIZE(gl_ar750_leds_gpio),
-+				 gl_ar750_leds_gpio);
-+
-+	ath79_register_gpio_keys_polled(-1, GL_AR750_KEYS_POLL_INTERVAL,
-+					ARRAY_SIZE(gl_ar750_gpio_keys),
-+					gl_ar750_gpio_keys);
-+
-+	gpio_request_one(GL_AR750_GPIO_USB_POWER,
-+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
-+			 "USB power");
-+
-+	platform_device_register(&gl_ar750_i2c_gpio);
-+
-+	ath79_register_usb();
-+
-+	ath79_register_wmac(art + GL_AR750_WMAC2G_CALDATA_OFFSET, NULL);
-+
-+	ap91_pci_init(art + GL_AR750_WMAC5G_CALDATA_OFFSET, NULL);
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_GL_AR750, "GL-AR750", "GL.iNet GL-AR750",
-+	     gl_ar750_setup);
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-index 89ddbbc976c9393608a80b9ce56e02a4d403ea2a..11ccdbb5083807ef137b8cd2d110de7a97a34e38 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-@@ -106,6 +106,7 @@ enum ath79_mach_type {
- 	ATH79_MACH_GL_AR150,			/* GL-AR150 support */
- 	ATH79_MACH_GL_AR300,			/* GL-AR300 */
- 	ATH79_MACH_GL_AR300M,			/* GL-AR300M */
-+	ATH79_MACH_GL_AR750,			/* GL.iNet GL-AR750 */
- 	ATH79_MACH_GL_DOMINO,			/* Domino */
- 	ATH79_MACH_GL_INET,			/* GL-CONNECT GL-INET */
- 	ATH79_MACH_GL_MIFI,			/* GL-MIFI support */
-diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk
-index d113c5ad621bb2f15d4cbc4fd50e60904313a7da..d1375c8742d8aea6224f7aca3d9e9522d8056a94 100644
---- a/target/linux/ar71xx/image/generic.mk
-+++ b/target/linux/ar71xx/image/generic.mk
-@@ -161,6 +161,19 @@ define Device/gl-ar300m
- endef
- TARGET_DEVICES += gl-ar300m
- 
-+define Device/gl-ar750
-+  DEVICE_TITLE := GL.iNet GL-AR750
-+  DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9887 kmod-usb-core \
-+	kmod-usb2 kmod-usb-storage
-+  BOARDNAME := GL-AR750
-+  SUPPORTED_DEVICES := gl-ar750
-+  IMAGE_SIZE := 16000k
-+  MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),64k(art)ro,-(firmware)
-+  IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \
-+	append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
-+endef
-+TARGET_DEVICES += gl-ar750
-+
- define Device/gl-domino
-   DEVICE_TITLE := GL Domino Pi
-   DEVICE_PACKAGES := kmod-usb-core kmod-usb2

patches/lede/0088-uboot-envtools-add-support-for-GL.iNet-GL-AR750.patch

-From: Piotr Dymacz <pepe2k@gmail.com>
-Date: Tue, 17 Oct 2017 23:32:11 +0200
-Subject: uboot-envtools: add support for GL.iNet GL-AR750
-
-Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
-
-diff --git a/package/boot/uboot-envtools/files/ar71xx b/package/boot/uboot-envtools/files/ar71xx
-index 25bec7eb33fd691bae417512c4c03e133d93213d..26f1ff938b8191e84315cf308f78e0907264c671 100644
---- a/package/boot/uboot-envtools/files/ar71xx
-+++ b/package/boot/uboot-envtools/files/ar71xx
-@@ -29,6 +29,7 @@ cr3000|\
- cr5000|\
- eap300v2|\
- gl-ar300m|\
-+gl-ar750|\
- hornet-ub|\
- hornet-ub-x2|\
- jwap230|\

patches/lede/0089-ar71xx-add-model-detection-for-UBNT-AC-Mesh.patch

-From: David Bauer <mail@david-bauer.net>
-Date: Sun, 25 Feb 2018 12:09:38 +0100
-Subject: ar71xx: add model detection for UBNT AC-Mesh
-
-This commit adds correct model detection for UniFi
-AC-Mesh. Previously said device was incorrectly detected
-as UniFi AC-Lite.
-
-The Information about the device is stored at 0xC in the EEPROM
-partition. It corresponds to the sysid in /etc/board.info of the
-Ubiquiti stock firmware.
-
-Signed-off-by: David Bauer <mail@david-bauer.net>
-
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 35b742a5f1fee0bc24ab2d88e32f118c1df4e2b3..59c1899a588007d6a6a1860fcf95064b0ec35561 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -98,6 +98,27 @@ ubnt_xm_board_detect() {
- 	[ -z "$model" ] || AR71XX_MODEL="${model}${magic:3:1}"
- }
- 
-+ubnt_ac_lite_get_mtd_part_magic() {
-+	ar71xx_get_mtd_offset_size_format EEPROM 12 2 %02x
-+}
-+
-+ubnt_ac_lite_board_detect() {
-+	local model
-+	local magic
-+
-+	magic="$(ubnt_ac_lite_get_mtd_part_magic)"
-+	case ${magic:0:4} in
-+	"e517")
-+		model="Ubiquiti UniFi-AC-LITE"
-+		;;
-+	"e557")
-+		model="Ubiquiti UniFi-AC-MESH"
-+		;;
-+	esac
-+
-+	[ -z "$model" ] || AR71XX_MODEL="${model}"
-+}
-+
- cybertan_get_hw_magic() {
- 	local part
- 
-@@ -1129,6 +1150,7 @@ ar71xx_board_detect() {
- 		;;
- 	*"UniFi-AC-LITE")
- 		name="unifiac-lite"
-+		ubnt_ac_lite_board_detect
- 		;;
- 	*"UniFi-AC-PRO")
- 		name="unifiac-pro"

patches/lede/0090-ar71xx-generic-enable-CONFIG_MTD_SPLIT_TPLINK_FW.patch

-From: Piotr Dymacz <pepe2k@gmail.com>
-Date: Mon, 3 Jul 2017 18:57:36 +0200
-Subject: ar71xx: generic: enable CONFIG_MTD_SPLIT_TPLINK_FW
-
-We can use "tplink-fw" mtd splitter for TP-Link devices which use kernel
-with TP-Link header embedded inside "safeloader" image type and thus get
-rid of statically defined "kernel" and "rootfs" partitions in cmdline.
-
-Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
-
-diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
-index d96642b97c36187febb1f3843e7dd9acfab0e40d..6c29cd7748b3ce7e53adf359cd5002ba01066fbd 100644
---- a/target/linux/ar71xx/config-4.4
-+++ b/target/linux/ar71xx/config-4.4
-@@ -379,6 +379,7 @@ CONFIG_MTD_SPLIT_EVA_FW=y
- CONFIG_MTD_SPLIT_FIRMWARE=y
- CONFIG_MTD_SPLIT_LZMA_FW=y
- CONFIG_MTD_SPLIT_SEAMA_FW=y
-+CONFIG_MTD_SPLIT_TPLINK_FW=y
- CONFIG_MTD_SPLIT_UIMAGE_FW=y
- CONFIG_MTD_SPLIT_WRGG_FW=y
- CONFIG_MTD_TPLINK_PARTS=y
-diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default
-index e0401102229c00985e8000331dce43375903e1aa..f5d48ae0f674883371f8d549594f695913c3d216 100644
---- a/target/linux/ar71xx/mikrotik/config-default
-+++ b/target/linux/ar71xx/mikrotik/config-default
-@@ -219,6 +219,7 @@ CONFIG_MTD_NAND_RB4XX=y
- CONFIG_MTD_NAND_RB750=y
- CONFIG_MTD_NAND_RB91X=y
- # CONFIG_MTD_SPLIT_EVA_FW is not set
-+# CONFIG_MTD_SPLIT_TPLINK_FW is not set
- # CONFIG_MTD_REDBOOT_PARTS is not set
- # CONFIG_MTD_TPLINK_PARTS is not set
- CONFIG_MTD_UBI=y
-diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
-index 790fa8f9bd42aba8521b960c2a49a742285e6157..0eee52d3ee69990fadf77de9f03f03c9c9b59190 100644
---- a/target/linux/ar71xx/nand/config-default
-+++ b/target/linux/ar71xx/nand/config-default
-@@ -107,6 +107,7 @@ CONFIG_MTD_NAND_ECC_BCH=y
- # CONFIG_MTD_SM_COMMON is not set
- # CONFIG_MTD_SPLIT_EVA_FW is not set
- # CONFIG_MTD_SPLIT_SEAMA_FW is not set
-+# CONFIG_MTD_SPLIT_TPLINK_FW is not set
- # CONFIG_MTD_TPLINK_PARTS is not set
- CONFIG_MTD_UBI=y
- CONFIG_MTD_UBI_BEB_LIMIT=20

patches/lede/0091-mac80211-initialize-sinfo-in-cfg80211_get_station.patch

-From: Sven Eckelmann <sven.eckelmann@openmesh.com>
-Date: Wed, 6 Jun 2018 11:21:53 +0200
-Subject: mac80211: initialize sinfo in cfg80211_get_station
-
-Most of the implementations behind cfg80211_get_station will not initialize
-sinfo to zero before manipulating it. For example, the member "filled",
-which indicates the filled in parts of this struct, is often only modified
-by enabling certain bits in the bitfield while keeping the remaining bits
-in their original state. A caller without a preinitialized sinfo.filled can
-then no longer decide which parts of sinfo were filled in by
-cfg80211_get_station (or actually the underlying implementations).
-
-cfg80211_get_station must therefore take care that sinfo is initialized to
-zero. Otherwise, the caller may tries to read information which was not
-filled in and which must therefore also be considered uninitialized. In
-batadv_v_elp_get_throughput's case, an invalid "random" expected throughput
-may be stored for this neighbor and thus the B.A.T.M.A.N V algorithm may
-switch to non-optimal neighbors for certain destinations.
-
-Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
-
-Forwarded: https://github.com/openwrt/openwrt/pull/1015
-
-diff --git a/package/kernel/mac80211/patches/379-cfg80211-initialize-sinfo-in-cfg80211_get_station.patch b/package/kernel/mac80211/patches/379-cfg80211-initialize-sinfo-in-cfg80211_get_station.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..37323c1f7defee830b3f876a46f255acf21fce42
---- /dev/null
-+++ b/package/kernel/mac80211/patches/379-cfg80211-initialize-sinfo-in-cfg80211_get_station.patch
-@@ -0,0 +1,42 @@
-+From 4f717a2589be649afddbbd3ac58b67ebfa7426f7 Mon Sep 17 00:00:00 2001
-+From: Sven Eckelmann <sven@narfation.org>
-+Date: Wed, 6 Jun 2018 10:18:31 +0200
-+Subject: [PATCH v2] cfg80211: initialize sinfo in cfg80211_get_station
-+
-+Most of the implementations behind cfg80211_get_station will not initialize
-+sinfo to zero before manipulating it. For example, the member "filled",
-+which indicates the filled in parts of this struct, is often only modified
-+by enabling certain bits in the bitfield while keeping the remaining bits
-+in their original state. A caller without a preinitialized sinfo.filled can
-+then no longer decide which parts of sinfo were filled in by
-+cfg80211_get_station (or actually the underlying implementations).
-+
-+cfg80211_get_station must therefore take care that sinfo is initialized to
-+zero. Otherwise, the caller may tries to read information which was not
-+filled in and which must therefore also be considered uninitialized. In
-+batadv_v_elp_get_throughput's case, an invalid "random" expected throughput
-+may be stored for this neighbor and thus the B.A.T.M.A.N V algorithm may
-+switch to non-optimal neighbors for certain destinations.
-+
-+Fixes: 7406353d43c8 ("cfg80211: implement cfg80211_get_station cfg80211 API")
-+Reported-by: Thomas Lauer <holminateur@gmail.com>
-+Reported-by: Marcel Schmidt <ff.z-casparistrasse@mailbox.org>
-+Cc: b.a.t.m.a.n@lists.open-mesh.org
-+Signed-off-by: Sven Eckelmann <sven@narfation.org>
-+
-+Forwarded: https://patchwork.kernel.org/patch/10449857/
-+---
-+ net/wireless/util.c | 2 ++
-+ 1 file changed, 2 insertions(+)
-+
-+--- a/net/wireless/util.c
-++++ b/net/wireless/util.c
-+@@ -1749,6 +1749,8 @@ int cfg80211_get_station(struct net_devi
-+ 	if (!rdev->ops->get_station)
-+ 		return -EOPNOTSUPP;
-+ 
-++	memset(sinfo, 0, sizeof(*sinfo));
-++
-+ 	return rdev_get_station(rdev, dev, mac_addr, sinfo);
-+ }
-+ EXPORT_SYMBOL(cfg80211_get_station);

patches/lede/0092-ar71xx-lzma-loader-move-padding-workaround-to-gzip-step.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 6 Jun 2018 20:51:05 +0200
-Subject: ar71xx: lzma-loader: move padding workaround to gzip step
-
-Some devices (TP-Link TL-WR1043ND v1) don't boot reliably when the
-uncompressed loader is too small. This was workarounded in the loader by
-adding 512KB of padding to the .data section of the loader binary.
-
-This approach had two issues:
-
-- The padding was only working when .data was non-empty (otherwise the
-  section would become NOBITS, omitting it in the binary). .data was only
-  empty when no CMDLINE was set, leading to further workarounds like
-  fe594bf90d09 ("ath79: fix loader-okli, lzma-loader"), and this
-  workaround was only effective because a missing "const" led to the kernel
-  argv being stored in .data instead of .rodata
-- The padding was not only added to the compressed .gz loader, but also
-  uncompressed .bin and .elf loaders. The prevented embedding the kernel
-  cmdline in the loader for non-gz loader types.
-
-To fix both issues, move the creation of the padding from the linker script
-to the gzip step.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/ar71xx/image/lzma-loader/Makefile b/target/linux/ar71xx/image/lzma-loader/Makefile
-index 9b81e87306f235d1e7284401828240b9b9787011..738093a958013624abb8f84a3874e1c795da349d 100644
---- a/target/linux/ar71xx/image/lzma-loader/Makefile
-+++ b/target/linux/ar71xx/image/lzma-loader/Makefile
-@@ -47,7 +47,11 @@ loader-compile: $(PKG_BUILD_DIR)/.prepared
- 		clean all
- 
- loader.gz: $(PKG_BUILD_DIR)/loader.bin
--	gzip -nc9 $< > $(LOADER_GZ)
-+	# Workaround for buggy bootloaders: Some devices
-+	# (TP-Link TL-WR1043ND v1) don't work correctly when
-+	# the uncompressed loader is too small (probably a cache
-+	# invalidation issue)
-+	dd if=$< bs=512K conv=sync | gzip -nc9 > $(LOADER_GZ)
- 
- loader.elf: $(PKG_BUILD_DIR)/loader.elf
- 	$(CP) $< $(LOADER_ELF)
-diff --git a/target/linux/ar71xx/image/lzma-loader/src/loader.lds b/target/linux/ar71xx/image/lzma-loader/src/loader.lds
-index 80cc7ca3ecf53a747fc139560b89c233f4343293..01ff85236147dc62bae480b191a44005171b1561 100644
---- a/target/linux/ar71xx/image/lzma-loader/src/loader.lds
-+++ b/target/linux/ar71xx/image/lzma-loader/src/loader.lds
-@@ -13,7 +13,6 @@ SECTIONS {
- 	.data : {
- 		*(.data)
- 		*(.data.*)
--		. = . + 524288;		/* workaround for buggy bootloaders */
- 	}
- 
- 	. = ALIGN(32);

patches/lede/0093-ar71xx-lzma-loader-set-page-size-to-4KB.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 6 Jun 2018 00:27:42 +0200
-Subject: ar71xx: lzma-loader: set page size to 4KB
-
-The text section in the ELF loader is aligned to the maximum page size,
-which defaults to 64KB. Reduce it to the actual page size to avoid wasting
-flash space for this alignment.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/ar71xx/image/lzma-loader/src/Makefile b/target/linux/ar71xx/image/lzma-loader/src/Makefile
-index 5f10bdb8f1499f24f00a8bf4d53f370fef88bd1e..fadb7e6206070c07aab3e8b323324976c6998eea 100644
---- a/target/linux/ar71xx/image/lzma-loader/src/Makefile
-+++ b/target/linux/ar71xx/image/lzma-loader/src/Makefile
-@@ -95,7 +95,7 @@ loader2.o: loader.bin
- 	$(LD) -r -b binary --oformat $(O_FORMAT) -o $@ $<
- 
- loader.elf: loader2.o
--	$(LD) -e startup -T loader2.lds -Ttext $(LOADADDR) -o $@ $<
-+	$(LD) -z max-page-size=0x1000 -e startup -T loader2.lds -Ttext $(LOADADDR) -o $@ $<
- 
- mrproper: clean
- 

patches/lede/0094-ar71xx-lzma-loader-constify-kernel-argv-array.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 6 Jun 2018 00:30:57 +0200
-Subject: ar71xx: lzma-loader: constify kernel argv array
-
-By making the kernel argv array const, the .data section can always be
-omitted from the laoder binary.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/ar71xx/image/lzma-loader/src/loader.c b/target/linux/ar71xx/image/lzma-loader/src/loader.c
-index cc73eb1721cbfbf2ad1bb94e8e6d3ab006983c5d..794c4b6285a7fa0423c22d172828415e6f2be93b 100644
---- a/target/linux/ar71xx/image/lzma-loader/src/loader.c
-+++ b/target/linux/ar71xx/image/lzma-loader/src/loader.c
-@@ -75,7 +75,7 @@ static unsigned long kernel_la;
- #ifdef CONFIG_KERNEL_CMDLINE
- #define kernel_argc	2
- static const char kernel_cmdline[] = CONFIG_KERNEL_CMDLINE;
--static const char *kernel_argv[] = {
-+static const char *const kernel_argv[] = {
- 	NULL,
- 	kernel_cmdline,
- 	NULL,

patches/lede/0095-ar71xx-make-loader-okli-build-step-more-generic.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 6 Jun 2018 00:34:25 +0200
-Subject: ar71xx: make loader-okli build step more generic
-
-Add support for different loader types.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 8eac5fc997cab0203718fb0558e6f5aaaeec9c38..de27f5d7c5ce6dbd31305c139afc128edaed15ee 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -73,8 +73,9 @@ define Build/loader-kernel-cmdline
- 	$(call Build/loader-common,LOADER_DATA="$@" KERNEL_CMDLINE="$(CMDLINE)")
- endef
- 
-+# Arguments: <output name> <kernel offset>
- define Build/loader-okli
--	dd if=$(KDIR)/loader-$(1).gz bs=7680 conv=sync of="$@.new"
-+	dd if=$(KDIR)/loader-$(word 1,$(1)).$(LOADER_TYPE) bs=$(word 2,$(1)) conv=sync of="$@.new"
- 	cat "$@" >> "$@.new"
- 	mv "$@.new" "$@"
- endef
-diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
-index 1e40d943ac2aa43aea670fd86268708aea39a46c..18e2c73737f477f4d00020893878cbdfb81a735b 100644
---- a/target/linux/ar71xx/image/tp-link.mk
-+++ b/target/linux/ar71xx/image/tp-link.mk
-@@ -69,7 +69,7 @@ $(Device/tplink)
-   LOADER_FLASH_OFFS := 0x22000
-   COMPILE := loader-$(1).gz
-   COMPILE/loader-$(1).gz := loader-okli-compile
--  KERNEL := copy-file $(KDIR)/vmlinux.bin.lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1)
-+  KERNEL := copy-file $(KDIR)/vmlinux.bin.lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 7680
-   KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs.bin.lzma | loader-kernel-cmdline | mktplinkfw-combined
- endef
- 

patches/lede/0096-ar71xx-switch-CPE-WBS-210-510-to-okli-loader.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 6 Jun 2018 00:35:17 +0200
-Subject: ar71xx: switch CPE/WBS 210/510 to okli-loader
-
-We recently increased the kernel partition size of the CPE/WBS 210/510.
-This works fine for new installations of the factory image, but on
-sysupgrades, the partition table read by the bootloader is not adjusted.
-This limits the maximum size of the kernel loaded by the bootloader to the
-old partition size.
-
-While adjusting the partition table would be a cleanest solution, such a
-migration would have to happen before an upgrade to a new version with a
-newer kernel. This is error-prone and would require a two-step upgrade, as
-we mark the partition table partition read-only.
-
-Instead, switch from the lzma-loader with embedded kernel to the
-okli-loader, so only the tiny lzma-loader is loaded by the bootloader as
-"kernel", and the lzma-loader will then load the rest of the kernel by
-itself.
-
-Fixes: e39847ea2f70 ("ar71xx: increase kernel partition size for CPE/WBS 210/510")
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
-index 18e2c73737f477f4d00020893878cbdfb81a735b..709b1558a5f8487c50e922ec4d27b643f080cbcc 100644
---- a/target/linux/ar71xx/image/tp-link.mk
-+++ b/target/linux/ar71xx/image/tp-link.mk
-@@ -173,7 +173,10 @@ define Device/cpe510-520
-   TPLINK_BOARD_NAME := CPE510
-   DEVICE_PROFILE := CPE510
-   LOADER_TYPE := elf
--  KERNEL := kernel-bin | patch-cmdline | lzma | loader-kernel
-+  LOADER_FLASH_OFFS := 0x43000
-+  COMPILE := loader-$(1).elf
-+  COMPILE/loader-$(1).elf := loader-okli-compile
-+  KERNEL := kernel-bin | lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 12288
-   IMAGES := sysupgrade.bin factory.bin
-   IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
-   IMAGE/factory.bin := append-rootfs | tplink-safeloader factory

patches/lede/0097-ar71xx-add-support-for-TP-Link-TL-WA901ND-v5.patch

-From: Paul Wassi <p.wassi@gmx.at>
-Date: Sun, 22 Oct 2017 22:39:30 +0200
-Subject: ar71xx: add support for TP-Link TL-WA901ND v5
-
-The TL-WA901ND v5 has the same hardware as v4, although the PCB has
-a different layout. Installation from factory is done via TFTP.
-(rename -factory image to wa901ndv4_tp_recovery.bin for tftp)
-
-Signed-off-by: Paul Wassi <p.wassi@gmx.at>
-
-diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds
-index f94cc3c85b798458cc97c06bb0d44bdc426d057d..a742854bc9b0aa48c61b37e58288177bbb56d14d 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
-@@ -606,7 +606,8 @@ tl-wa860re|\
- tl-wa830re-v2|\
- tl-wa801nd-v2|\
- tl-wa901nd-v3|\
--tl-wa901nd-v4)
-+tl-wa901nd-v4|\
-+tl-wa901nd-v5)
- 	ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
- 	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
- 	;;
-diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
-index c8990c60f504286d0fd28c7b17f54c9c3b5a891e..875a1a38ada9fb66503505d2f094310db1295a07 100755
---- a/target/linux/ar71xx/base-files/etc/board.d/02_network
-+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
-@@ -110,6 +110,7 @@ ar71xx_setup_interfaces()
- 	tl-wa901nd-v2|\
- 	tl-wa901nd-v3|\
- 	tl-wa901nd-v4|\
-+	tl-wa901nd-v5|\
- 	tl-wr703n|\
- 	tl-wr802n-v1|\
- 	tube2h|\
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index 01d3b787bedcab82a5797c9a4801e8139887cc2c..f8d2eb314f7b57a1134b68c504c0dac202ed947c 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -363,6 +363,7 @@ get_status_led() {
- 	tl-wa901nd-v2|\
- 	tl-wa901nd-v3|\
- 	tl-wa901nd-v4|\
-+	tl-wa901nd-v5|\
- 	tl-wdr3320-v2|\
- 	tl-wdr3500|\
- 	tl-wr1041n-v2|\
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 59c1899a588007d6a6a1860fcf95064b0ec35561..b365b6ae4aa6021960499b3889d846b5171eec0f 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -1058,6 +1058,9 @@ ar71xx_board_detect() {
- 	*"TL-WA901ND v4")
- 		name="tl-wa901nd-v4"
- 		;;
-+	*"TL-WA901ND v5")
-+		name="tl-wa901nd-v5"
-+		;;
- 	*"TL-WDR3320 v2")
- 		name="tl-wdr3320-v2"
- 		;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index 236520b27c4d6d0b1b7e483d1100fb5ab156d475..0b422d71c2639a31bc7e88a20976266b66ec4490 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -415,6 +415,7 @@ platform_check_image() {
- 	tl-wa901nd-v2|\
- 	tl-wa901nd-v3|\
- 	tl-wa901nd-v4|\
-+	tl-wa901nd-v5|\
- 	tl-wa901nd|\
- 	tl-wdr3320-v2|\
- 	tl-wdr3500|\
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd-v4.c
-index 9c651bb1d256bc13a3fe31b664f2cd3590e8092f..ffbcd6fe42df9b7c0dd86ae23a21ab7c90917a8c 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd-v4.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd-v4.c
-@@ -1,5 +1,5 @@
- /*
-- *  TP-LINK TL-WA901ND v4 board
-+ *  TP-LINK TL-WA901ND v4, v5 board
-  *
-  *  Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
-  *  Copyright (C) 2016 Tiziano Bacocco <tizbac2@gmail.com>
-@@ -110,3 +110,6 @@ static void __init TL_WA901ND_V4_setup(void)
- 
- MIPS_MACHINE(ATH79_MACH_TL_WA901ND_V4, "TL-WA901ND-v4", "TP-LINK TL-WA901ND v4",
- 	     TL_WA901ND_V4_setup);
-+
-+MIPS_MACHINE(ATH79_MACH_TL_WA901ND_V5, "TL-WA901ND-v5", "TP-LINK TL-WA901ND v5",
-+	     TL_WA901ND_V4_setup);
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-index 11ccdbb5083807ef137b8cd2d110de7a97a34e38..a4c7f52fe94e17bc48bebfb460f12f3e5ac35afe 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
-@@ -213,6 +213,7 @@ enum ath79_mach_type {
- 	ATH79_MACH_TL_WA901ND_V2,		/* TP-LINK TL-WA901ND v2 */
- 	ATH79_MACH_TL_WA901ND_V3,		/* TP-LINK TL-WA901ND v3 */
- 	ATH79_MACH_TL_WA901ND_V4,		/* TP-LINK TL-WA901ND v4 */
-+	ATH79_MACH_TL_WA901ND_V5,		/* TP-LINK TL-WA901ND v5 */
- 	ATH79_MACH_TL_WDR3320_V2,		/* TP-LINK TL-WDR3320 v2 */
- 	ATH79_MACH_TL_WDR3500,			/* TP-LINK TL-WDR3500 */
- 	ATH79_MACH_TL_WDR4300,			/* TP-LINK TL-WDR4300 */
-diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
-index 709b1558a5f8487c50e922ec4d27b643f080cbcc..6a3faef518ebfa4f36d3074ee9c102b801e04275 100644
---- a/target/linux/ar71xx/image/tp-link.mk
-+++ b/target/linux/ar71xx/image/tp-link.mk
-@@ -1103,7 +1103,13 @@ define Device/tl-wa901nd-v4
-     IMAGE/factory.bin := append-rootfs | mktplinkfw factory -C EU
- endef
- 
--TARGET_DEVICES += tl-wa901nd-v1 tl-wa901nd-v2 tl-wa901nd-v3 tl-wa901nd-v4
-+define Device/tl-wa901nd-v5
-+  $(Device/tl-wa901nd-v4)
-+  DEVICE_TITLE := TP-LINK TL-WA901N/ND v5
-+  BOARDNAME := TL-WA901ND-v5
-+  TPLINK_HWID := 0x09010005
-+endef
-+TARGET_DEVICES += tl-wa901nd-v1 tl-wa901nd-v2 tl-wa901nd-v3 tl-wa901nd-v4 tl-wa901nd-v5
- 
- define Device/tl-wa7210n-v2
-     $(Device/tplink-4mlzma)

patches/lede/0002-procd-add-support-for-alternative-rc.d-directories.patch → patches/openwrt/0001-procd-add-support-for-alternative-rc.d-directories.patch

@@ -4,10 +4,10 @@ Subject: procd: add support for alternative rc.d directories
 
 diff --git a/package/system/procd/patches/0001-Add-support-for-alternative-rc.d-directories.patch b/package/system/procd/patches/0001-Add-support-for-alternative-rc.d-directories.patch
 new file mode 100644
-index 0000000000000000000000000000000000000000..bc2434200364b46f1db4c2eec22c4e8b973844d5
+index 0000000000000000000000000000000000000000..16d3179f05c64b7178f883745294c64a27127775
 --- /dev/null
 +++ b/package/system/procd/patches/0001-Add-support-for-alternative-rc.d-directories.patch
-@@ -0,0 +1,97 @@
+@@ -0,0 +1,80 @@
 +From 03a2bc70e4260ec9f669391c47b9a7a9ecd0b75d Mon Sep 17 00:00:00 2001
 +Message-Id: <03a2bc70e4260ec9f669391c47b9a7a9ecd0b75d.1407329621.git.mschiffer@universe-factory.net>
 +From: Matthias Schiffer <mschiffer@universe-factory.net>
@@ -19,21 +19,10 @@ index 0000000000000000000000000000000000000000..bc2434200364b46f1db4c2eec22c4e8b
 + rcS.c           |  2 +-
 + 2 files changed, 39 insertions(+), 1 deletion(-)
 +
-+diff --git a/initd/preinit.c b/initd/preinit.c
-+index fb94527..8b832a7 100644
 +--- a/initd/preinit.c
 ++++ b/initd/preinit.c
-+@@ -12,6 +12,8 @@
-+  * GNU General Public License for more details.
-+  */
-+ 
-++#define _GNU_SOURCE
-++
-+ #include <sys/stat.h>
-+ #include <sys/types.h>
-+ #include <sys/mount.h>
-+@@ -46,6 +48,35 @@ check_dbglvl(void)
-+ 		debug = lvl;
++@@ -87,12 +87,42 @@ fail:
++ 	free(command);
 + }
 + 
 ++static char*
@@ -68,15 +57,14 @@ index 0000000000000000000000000000000000000000..bc2434200364b46f1db4c2eec22c4e8b
 + static void
 + spawn_procd(struct uloop_process *proc, int ret)
 + {
-+@@ -53,6 +84,7 @@ spawn_procd(struct uloop_process *proc, int ret)
++ 	char *wdt_fd = watchdog_fd();
 + 	char *argv[] = { "/sbin/procd", NULL};
-+ 	struct stat s;
 + 	char dbg[2];
 ++	char *rc_d_path;
 + 
 + 	if (plugd_proc.pid > 0)
 + 		kill(plugd_proc.pid, SIGKILL);
-+@@ -72,6 +104,12 @@ spawn_procd(struct uloop_process *proc, int ret)
++@@ -112,6 +142,12 @@ spawn_procd(struct uloop_process *proc,
 + 		setenv("DBGLVL", dbg, 1);
 + 	}
 + 
@@ -89,11 +77,9 @@ index 0000000000000000000000000000000000000000..bc2434200364b46f1db4c2eec22c4e8b
 + 	execvp(argv[0], argv);
 + }
 + 
-+diff --git a/rcS.c b/rcS.c
-+index 0e1b0ba..1b00831 100644
 +--- a/rcS.c
 ++++ b/rcS.c
-+@@ -150,7 +150,7 @@ int rcS(char *pattern, char *param, void (*q_empty)(struct runqueue *))
++@@ -184,7 +184,7 @@ int rcS(char *pattern, char *param, void
 + 	q.empty_cb = q_empty;
 + 	q.max_running_tasks = 1;
 + 
@@ -102,6 +88,3 @@ index 0000000000000000000000000000000000000000..bc2434200364b46f1db4c2eec22c4e8b
 + }
 + 
 + int rc(const char *file, char *param)
-+-- 
-+2.0.4
-+

patches/openwrt/0003-HACK-opkg-do-not-preserve-opkg-keys-on-upgrades-by-default.patch

+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Sun, 30 Mar 2025 13:16:02 +0200
+Subject: HACK: opkg: do not preserve opkg keys on upgrades by default
+
+Custom keys can still be preserved by listing them in sysupgrade.conf.
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
+index e7c45e3523135a6cc35385a81c65cf2831b842bb..fc5ec6a7ed1eb559a478b00b03102fbccd543c57 100644
+--- a/package/system/opkg/Makefile
++++ b/package/system/opkg/Makefile
+@@ -56,7 +56,6 @@ endef
+ 
+ define Package/opkg/conffiles
+ /etc/opkg.conf
+-/etc/opkg/keys/
+ /etc/opkg/customfeeds.conf
+ endef
+ 

patches/openwrt/0004-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch

+From: Linus Lüssing <linus.luessing@c0d3.blue>
+Date: Sat, 1 Jan 2022 10:09:13 +0100
+Subject: kernel: bridge: Implement MLD Querier wake-up calls / Android bug workaround
+
+Implement a configurable MLD Querier wake-up calls "feature" which
+works around a widely spread Android bug in connection with IGMP/MLD
+snooping.
+
+Currently there are mobile devices (e.g. Android) which are not able
+to receive and respond to MLD Queries reliably because the Wifi driver
+filters a lot of ICMPv6 when the device is asleep - including
+MLD. This in turn breaks IPv6 communication when MLD Snooping is
+enabled. However there is one ICMPv6 type which is allowed to pass and
+which can be used to wake up the mobile device: ICMPv6 Echo Requests.
+
+If this bridge is the selected MLD Querier then setting
+"multicast_wakeupcall" to a number n greater than 0 will send n
+ICMPv6 Echo Requests to each host behind this port to wake
+them up with each MLD Query. Upon receiving a matching ICMPv6 Echo
+Reply an MLD Query with a unicast ethernet destination will be sent
+to the specific host(s).
+
+Link: https://issuetracker.google.com/issues/149630944
+Link: https://github.com/freifunk-gluon/gluon/issues/1832
+
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+
+diff --git a/package/network/config/netifd/patches/0001-bridge-Add-multicast_wakeupcall-option.patch b/package/network/config/netifd/patches/0001-bridge-Add-multicast_wakeupcall-option.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..077a563b6066cd1d3aee4b1e82328e8cc5e042ea
+--- /dev/null
++++ b/package/network/config/netifd/patches/0001-bridge-Add-multicast_wakeupcall-option.patch
+@@ -0,0 +1,142 @@
++From d23a49e6542dc068b12fbc7b6a4520f9fb3626f9 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
++Date: Sun, 5 Jul 2020 23:33:51 +0200
++Subject: [PATCH] bridge: Add multicast_wakeupcall option
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
++
++This makes the new per bridge port multicast_wakeupcall feature
++for the Linux bridge configurable for wireless interfaces and enables it
++by default for an AP interface.
++
++The MLD Querier wake-up calls "feature" works around a widely spread Android
++bug in connection with IGMP/MLD snooping.
++
++Currently there are mobile devices (e.g. Android) which are not able
++to receive and respond to MLD Queries reliably because the Wifi driver
++filters a lot of ICMPv6 when the device is asleep - including
++MLD. This in turn breaks IPv6 communication when MLD Snooping is
++enabled. However there is one ICMPv6 type which is allowed to pass and
++which can be used to wake up the mobile device: ICMPv6 Echo Requests.
++
++If this bridge is the selected MLD Querier then setting
++"multicast_wakeupcall" to a number n greater than 0 will send n
++ICMPv6 Echo Requests to each host behind this port to wake
++them up with each MLD Query. Upon receiving a matching ICMPv6 Echo
++Reply an MLD Query with a unicast ethernet destination will be sent
++to the specific host(s).
++
++Link: https://issuetracker.google.com/issues/149630944
++Link: https://github.com/freifunk-gluon/gluon/issues/1832
++
++Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
++---
++ device.c       |  9 +++++++++
++ device.h       |  3 +++
++ system-linux.c | 13 +++++++++++++
++ 3 files changed, 25 insertions(+)
++
++--- a/device.c
+++++ b/device.c
++@@ -49,6 +49,7 @@ static const struct blobmsg_policy dev_a
++ 	[DEV_ATTR_NEIGHGCSTALETIME] = { .name = "neighgcstaletime", .type = BLOBMSG_TYPE_INT32 },
++ 	[DEV_ATTR_DADTRANSMITS] = { .name = "dadtransmits", .type = BLOBMSG_TYPE_INT32 },
++ 	[DEV_ATTR_MULTICAST_TO_UNICAST] = { .name = "multicast_to_unicast", .type = BLOBMSG_TYPE_BOOL },
+++	[DEV_ATTR_MULTICAST_WAKEUPCALL] = { .name = "multicast_wakeupcall", .type = BLOBMSG_TYPE_INT32 },
++ 	[DEV_ATTR_MULTICAST_ROUTER] = { .name = "multicast_router", .type = BLOBMSG_TYPE_INT32 },
++ 	[DEV_ATTR_MULTICAST_FAST_LEAVE] = { .name = "multicast_fast_leave", . type = BLOBMSG_TYPE_BOOL },
++ 	[DEV_ATTR_MULTICAST] = { .name ="multicast", .type = BLOBMSG_TYPE_BOOL },
++@@ -275,6 +276,7 @@ device_merge_settings(struct device *dev
++ 	n->multicast = s->flags & DEV_OPT_MULTICAST ?
++ 		s->multicast : os->multicast;
++ 	n->multicast_to_unicast = s->multicast_to_unicast;
+++	n->multicast_wakeupcall = s->multicast_wakeupcall;
++ 	n->multicast_router = s->multicast_router;
++ 	n->multicast_fast_leave = s->multicast_fast_leave;
++ 	n->learning = s->learning;
++@@ -449,6 +451,11 @@ device_init_settings(struct device *dev,
++ 		s->flags |= DEV_OPT_MULTICAST_TO_UNICAST;
++ 	}
++ 
+++	if ((cur = tb[DEV_ATTR_MULTICAST_WAKEUPCALL])) {
+++		s->multicast_wakeupcall = blobmsg_get_u32(cur);
+++		s->flags |= DEV_OPT_MULTICAST_WAKEUPCALL;
+++	}
+++
++ 	if ((cur = tb[DEV_ATTR_MULTICAST_ROUTER])) {
++ 		s->multicast_router = blobmsg_get_u32(cur);
++ 		if (s->multicast_router <= 2)
++@@ -1372,6 +1379,8 @@ device_dump_status(struct blob_buf *b, s
++ 			blobmsg_add_u32(b, "dadtransmits", st.dadtransmits);
++ 		if (st.flags & DEV_OPT_MULTICAST_TO_UNICAST)
++ 			blobmsg_add_u8(b, "multicast_to_unicast", st.multicast_to_unicast);
+++		if (st.flags & DEV_OPT_MULTICAST_WAKEUPCALL)
+++			blobmsg_add_u32(b, "multicast_wakeupcall", st.multicast_wakeupcall);
++ 		if (st.flags & DEV_OPT_MULTICAST_ROUTER)
++ 			blobmsg_add_u32(b, "multicast_router", st.multicast_router);
++ 		if (st.flags & DEV_OPT_MULTICAST_FAST_LEAVE)
++--- a/device.h
+++++ b/device.h
++@@ -44,6 +44,7 @@ enum {
++ 	DEV_ATTR_NEIGHREACHABLETIME,
++ 	DEV_ATTR_DADTRANSMITS,
++ 	DEV_ATTR_MULTICAST_TO_UNICAST,
+++	DEV_ATTR_MULTICAST_WAKEUPCALL,
++ 	DEV_ATTR_MULTICAST_ROUTER,
++ 	DEV_ATTR_MULTICAST_FAST_LEAVE,
++ 	DEV_ATTR_MULTICAST,
++@@ -144,6 +145,7 @@ enum {
++ 	DEV_OPT_GRO			= (1ULL << 37),
++ 	DEV_OPT_MASTER			= (1ULL << 38),
++ 	DEV_OPT_EEE			= (1ULL << 39),
+++	DEV_OPT_MULTICAST_WAKEUPCALL	= (1ULL << 63),
++ };
++ 
++ /* events broadcasted to all users of a device */
++@@ -205,6 +207,7 @@ struct device_settings {
++ 	int neigh4locktime;
++ 	unsigned int dadtransmits;
++ 	bool multicast_to_unicast;
+++	unsigned int multicast_wakeupcall;
++ 	unsigned int multicast_router;
++ 	bool multicast_fast_leave;
++ 	bool multicast;
++--- a/system-linux.c
+++++ b/system-linux.c
++@@ -536,6 +536,11 @@ static void system_bridge_set_multicast_
++ 	system_set_dev_sysfs("brport/multicast_to_unicast", dev->ifname, val);
++ }
++ 
+++static void system_bridge_set_multicast_wakeupcall(struct device *dev, const char *val)
+++{
+++	system_set_dev_sysfs("brport/multicast_wakeupcall", dev->ifname, val);
+++}
+++
++ static void system_bridge_set_multicast_fast_leave(struct device *dev, const char *val)
++ {
++ 	system_set_dev_sysfs("brport/multicast_fast_leave", dev->ifname, val);
++@@ -923,8 +928,10 @@ static char *system_get_bridge(const cha
++ static void
++ system_bridge_set_wireless(struct device *bridge, struct device *dev)
++ {
+++	unsigned int mcast_wakeupcall = dev->wireless_ap ? 2 : 0;
++ 	bool mcast_to_ucast = dev->wireless_ap;
++ 	bool hairpin;
+++	char buf[64];
++ 
++ 	if (dev->settings.flags & DEV_OPT_MULTICAST_TO_UNICAST)
++ 		mcast_to_ucast = dev->settings.multicast_to_unicast;
++@@ -939,6 +946,12 @@ system_bridge_set_wireless(struct device
++ 	system_bridge_set_multicast_to_unicast(dev, mcast_to_ucast ? "1" : "0");
++ 	system_bridge_set_hairpin_mode(dev, hairpin ? "1" : "0");
++ 	system_bridge_set_proxyarp_wifi(dev, dev->wireless_proxyarp ? "1" : "0");
+++
+++	if (bridge->settings.flags & DEV_OPT_MULTICAST_WAKEUPCALL)
+++		mcast_wakeupcall = dev->settings.multicast_wakeupcall;
+++
+++	snprintf(buf, sizeof(buf), "%u", mcast_wakeupcall);
+++	system_bridge_set_multicast_wakeupcall(dev, buf);
++ }
++ 
++ int system_bridge_addif(struct device *bridge, struct device *dev)
+diff --git a/target/linux/generic/config-6.6 b/target/linux/generic/config-6.6
+index e31cca45cc4233b1a382a1f3dba965df1b9a6ae5..d7e08f35cf4c5688ed418bfd44f44944e07156c8 100644
+--- a/target/linux/generic/config-6.6
++++ b/target/linux/generic/config-6.6
+@@ -717,6 +717,7 @@ CONFIG_BRIDGE=y
+ # CONFIG_BRIDGE_EBT_T_NAT is not set
+ # CONFIG_BRIDGE_EBT_VLAN is not set
+ CONFIG_BRIDGE_IGMP_SNOOPING=y
++CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS=y
+ # CONFIG_BRIDGE_MRP is not set
+ # CONFIG_BRIDGE_NETFILTER is not set
+ # CONFIG_BRIDGE_NF_EBTABLES is not set
+diff --git a/target/linux/generic/hack-6.6/602-bridge-Implement-MLD-Querier-wake-up-calls-Android-b.patch b/target/linux/generic/hack-6.6/602-bridge-Implement-MLD-Querier-wake-up-calls-Android-b.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..5a54131fab24f9cfaa9c51d51b3163bd2ecaf4c3
+--- /dev/null
++++ b/target/linux/generic/hack-6.6/602-bridge-Implement-MLD-Querier-wake-up-calls-Android-b.patch
+@@ -0,0 +1,690 @@
++From 9734fac17903cc0c67c63361525cc99f793fd6d7 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
++Date: Mon, 29 Jun 2020 19:04:05 +0200
++Subject: [PATCH] bridge: Implement MLD Querier wake-up calls / Android bug
++ workaround
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
++
++Implement a configurable MLD Querier wake-up calls "feature" which
++works around a widely spread Android bug in connection with IGMP/MLD
++snooping.
++
++Currently there are mobile devices (e.g. Android) which are not able
++to receive and respond to MLD Queries reliably because the Wifi driver
++filters a lot of ICMPv6 when the device is asleep - including
++MLD. This in turn breaks IPv6 communication when MLD Snooping is
++enabled. However there is one ICMPv6 type which is allowed to pass and
++which can be used to wake up the mobile device: ICMPv6 Echo Requests.
++
++If this bridge is the selected MLD Querier then setting
++"multicast_wakeupcall" to a number n greater than 0 will send n
++ICMPv6 Echo Requests to each host behind this port to wake
++them up with each MLD Query. Upon receiving a matching ICMPv6 Echo
++Reply an MLD Query with a unicast ethernet destination will be sent
++to the specific host(s).
++
++Link: https://issuetracker.google.com/issues/149630944
++Link: https://github.com/freifunk-gluon/gluon/issues/1832
++
++Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
++---
++ include/linux/if_bridge.h    |   1 +
++ include/net/addrconf.h       |   1 +
++ include/uapi/linux/if_link.h |   1 +
++ net/bridge/Kconfig           |  26 ++++
++ net/bridge/br_fdb.c          |  10 ++
++ net/bridge/br_input.c        |   4 +-
++ net/bridge/br_multicast.c    | 291 ++++++++++++++++++++++++++++++++++-
++ net/bridge/br_netlink.c      |  19 +++
++ net/bridge/br_private.h      |  20 +++
++ net/bridge/br_sysfs_if.c     |  18 +++
++ net/core/rtnetlink.c         |   2 +-
++ net/ipv6/mcast_snoop.c       |   3 +-
++ 12 files changed, 386 insertions(+), 10 deletions(-)
++
++diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
++index cff03a1dfd68..70b6f74653d0 100644
++--- a/include/linux/if_bridge.h
+++++ b/include/linux/if_bridge.h
++@@ -62,6 +62,7 @@ struct br_ip_list {
++ #define BR_PORT_MAB		BIT(22)
++ #define BR_NEIGH_VLAN_SUPPRESS	BIT(23)
++ #define BR_BPDU_FILTER		BIT(24)
+++#define BR_MULTICAST_WAKEUPCALL	BIT(25)
++ 
++ #define BR_DEFAULT_AGEING_TIME	(300 * HZ)
++ 
++diff --git a/include/net/addrconf.h b/include/net/addrconf.h
++index facb7a469efa..817a33d1c055 100644
++--- a/include/net/addrconf.h
+++++ b/include/net/addrconf.h
++@@ -243,6 +243,7 @@ void ipv6_mc_unmap(struct inet6_dev *idev);
++ void ipv6_mc_remap(struct inet6_dev *idev);
++ void ipv6_mc_init_dev(struct inet6_dev *idev);
++ void ipv6_mc_destroy_dev(struct inet6_dev *idev);
+++int ipv6_mc_check_icmpv6(struct sk_buff *skb);
++ int ipv6_mc_check_mld(struct sk_buff *skb);
++ void addrconf_dad_failure(struct sk_buff *skb, struct inet6_ifaddr *ifp);
++ 
++diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
++index b29417908271..88b1c8a19bb4 100644
++--- a/include/uapi/linux/if_link.h
+++++ b/include/uapi/linux/if_link.h
++@@ -572,6 +572,7 @@ enum {
++ 	IFLA_BRPORT_NEIGH_VLAN_SUPPRESS,
++ 	IFLA_BRPORT_BACKUP_NHID,
++ 	IFLA_BRPORT_BPDU_FILTER,
+++	IFLA_BRPORT_MCAST_WAKEUPCALL,
++ 	__IFLA_BRPORT_MAX
++ };
++ #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
++diff --git a/net/bridge/Kconfig b/net/bridge/Kconfig
++index 3c8ded7d3e84..1a11e22c7d51 100644
++--- a/net/bridge/Kconfig
+++++ b/net/bridge/Kconfig
++@@ -48,6 +48,32 @@ config BRIDGE_IGMP_SNOOPING
++ 
++ 	  If unsure, say Y.
++ 
+++config BRIDGE_IGMP_SNOOPING_WAKEUPCALLS
+++	bool "MLD Querier wake-up calls"
+++	depends on BRIDGE_IGMP_SNOOPING
+++	depends on IPV6
+++	help
+++	  If you say Y here, then the MLD Snooping Querier will be built
+++	  with a per bridge port wake-up call "feature"/workaround.
+++
+++	  Currently there are mobile devices (e.g. Android) which are not able
+++	  to receive and respond to MLD Queries reliably because the Wifi driver
+++	  filters a lot of ICMPv6 when the device is asleep - including MLD.
+++	  This in turn breaks IPv6 communication when MLD Snooping is enabled.
+++	  However there is one ICMPv6 type which is allowed to pass and
+++	  which can be used to wake up the mobile device: ICMPv6 Echo Requests.
+++
+++	  If this bridge is the selected MLD Querier then setting
+++	  "multicast_wakeupcall" to a number n greater than 0 will send n
+++	  ICMPv6 Echo Requests to each host behind this port to wake them up
+++	  with each MLD Query. Upon receiving a matching ICMPv6 Echo Reply
+++	  an MLD Query with a unicast ethernet destination will be sent to the
+++	  specific host(s).
+++
+++	  Say N to exclude this support and reduce the binary size.
+++
+++	  If unsure, say N.
+++
++ config BRIDGE_VLAN_FILTERING
++ 	bool "VLAN filtering"
++ 	depends on BRIDGE
++diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
++index a6d8cd9a5807..b70426806d45 100644
++--- a/net/bridge/br_fdb.c
+++++ b/net/bridge/br_fdb.c
++@@ -80,6 +80,10 @@ static void fdb_rcu_free(struct rcu_head *head)
++ {
++ 	struct net_bridge_fdb_entry *ent
++ 		= container_of(head, struct net_bridge_fdb_entry, rcu);
+++
+++#ifdef CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS
+++	del_timer_sync(&ent->wakeupcall_timer);
+++#endif
++ 	kmem_cache_free(br_fdb_cache, ent);
++ }
++ 
++@@ -400,6 +404,12 @@ static struct net_bridge_fdb_entry *fdb_create(struct net_bridge *br,
++ 	fdb->key.vlan_id = vid;
++ 	fdb->flags = flags;
++ 	fdb->updated = fdb->used = jiffies;
+++
+++#ifdef CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS
+++		timer_setup(&fdb->wakeupcall_timer,
+++			    br_multicast_send_wakeupcall, 0);
+++#endif
+++
++ 	err = rhashtable_lookup_insert_fast(&br->fdb_hash_tbl, &fdb->rhnode,
++ 					    br_fdb_rht_params);
++ 	if (err) {
++diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
++index 4540c76d6079..d4644aab7dbf 100644
++--- a/net/bridge/br_input.c
+++++ b/net/bridge/br_input.c
++@@ -204,8 +204,10 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
++ 	if (dst) {
++ 		unsigned long now = jiffies;
++ 
++-		if (test_bit(BR_FDB_LOCAL, &dst->flags))
+++		if (test_bit(BR_FDB_LOCAL, &dst->flags)) {
+++			br_multicast_wakeupcall_rcv(brmctx, pmctx, skb, vid);
++ 			return br_pass_frame_up(skb, false);
+++		}
++ 
++ 		if (now != dst->used)
++ 			dst->used = now;
++diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
++index c38244d60ff8..df3a4d4dbb8f 100644
++--- a/net/bridge/br_multicast.c
+++++ b/net/bridge/br_multicast.c
++@@ -1076,15 +1076,16 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge_mcast *brm
++ 						    const struct in6_addr *group,
++ 						    bool with_srcs, bool over_llqt,
++ 						    u8 sflag, u8 *igmp_type,
++-						    bool *need_rexmit)
+++						    bool *need_rexmit,
+++						    bool delay)
++ {
++ 	struct net_bridge_port *p = pg ? pg->key.port : NULL;
++ 	struct net_bridge_group_src *ent;
++ 	size_t pkt_size, mld_hdr_size;
++ 	unsigned long now = jiffies;
+++	unsigned long interval = 0;
++ 	struct mld2_query *mld2q;
++ 	void *csum_start = NULL;
++-	unsigned long interval;
++ 	__sum16 *csum = NULL;
++ 	struct ipv6hdr *ip6h;
++ 	struct mld_msg *mldq;
++@@ -1166,9 +1167,13 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge_mcast *brm
++ 
++ 	/* ICMPv6 */
++ 	skb_set_transport_header(skb, skb->len);
++-	interval = ipv6_addr_any(group) ?
++-			brmctx->multicast_query_response_interval :
++-			brmctx->multicast_last_member_interval;
+++	if (delay) {
+++		interval = ipv6_addr_any(group) ?
+++				brmctx->multicast_query_response_interval :
+++				brmctx->multicast_last_member_interval;
+++		interval = jiffies_to_msecs(interval);
+++	}
+++
++ 	*igmp_type = ICMPV6_MGM_QUERY;
++ 	switch (brmctx->multicast_mld_version) {
++ 	case 1:
++@@ -1176,7 +1181,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge_mcast *brm
++ 		mldq->mld_type = ICMPV6_MGM_QUERY;
++ 		mldq->mld_code = 0;
++ 		mldq->mld_cksum = 0;
++-		mldq->mld_maxdelay = htons((u16)jiffies_to_msecs(interval));
+++		mldq->mld_maxdelay = htons((u16)interval);
++ 		mldq->mld_reserved = 0;
++ 		mldq->mld_mca = *group;
++ 		csum = &mldq->mld_cksum;
++@@ -1267,7 +1272,7 @@ static struct sk_buff *br_multicast_alloc_query(struct net_bridge_mcast *brmctx,
++ 						    &ip6_dst, &group->dst.ip6,
++ 						    with_srcs, over_lmqt,
++ 						    sflag, igmp_type,
++-						    need_rexmit);
+++						    need_rexmit, true);
++ 	}
++ #endif
++ 	}
++@@ -1777,6 +1782,169 @@ static void br_multicast_select_own_querier(struct net_bridge_mcast *brmctx,
++ #endif
++ }
++ 
+++#ifdef CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS
+++
+++#define BR_MC_WAKEUP_ID htons(0xEC6B) /* random identifier */
+++#define BR_MC_ETH_ZERO { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+++#define BR_MC_IN6_ZERO \
+++{ \
+++	.s6_addr32[0] = 0, .s6_addr32[1] = 0, \
+++	.s6_addr32[2] = 0, .s6_addr32[3] = 0, \
+++}
+++
+++#define BR_MC_IN6_FE80 \
+++{ \
+++	.s6_addr32[0] = htonl(0xfe800000), \
+++	.s6_addr32[1] = 0, \
+++	.s6_addr32[2] = htonl(0x000000ff), \
+++	.s6_addr32[3] = htonl(0xfe000000), \
+++}
+++
+++#define BR_MC_ECHO_LEN sizeof(pkt->echohdr)
+++
+++static struct sk_buff *br_multicast_alloc_wakeupcall(struct net_bridge *br,
+++						     struct net_bridge_port *port,
+++						     u8 *eth_dst)
+++{
+++	struct in6_addr ip6_src, ip6_dst = BR_MC_IN6_FE80;
+++	struct sk_buff *skb;
+++	__wsum csum_part;
+++	__sum16 csum;
+++
+++	struct wakeupcall_pkt {
+++		struct ethhdr ethhdr;
+++		struct ipv6hdr ip6hdr;
+++		struct icmp6hdr echohdr;
+++	} __packed;
+++
+++	struct wakeupcall_pkt *pkt;
+++
+++	static const struct wakeupcall_pkt __pkt_template = {
+++		.ethhdr = {
+++			.h_dest = BR_MC_ETH_ZERO, // update
+++			.h_source = BR_MC_ETH_ZERO, // update
+++			.h_proto = htons(ETH_P_IPV6),
+++		},
+++		.ip6hdr = {
+++			.priority = 0,
+++			.version = 0x6,
+++			.flow_lbl = { 0x00, 0x00, 0x00 },
+++			.payload_len = htons(BR_MC_ECHO_LEN),
+++			.nexthdr = IPPROTO_ICMPV6,
+++			.hop_limit = 1,
+++			.saddr = BR_MC_IN6_ZERO, // update
+++			.daddr = BR_MC_IN6_ZERO, // update
+++		},
+++		.echohdr = {
+++			.icmp6_type = ICMPV6_ECHO_REQUEST,
+++			.icmp6_code = 0,
+++			.icmp6_cksum = 0, // update
+++			.icmp6_dataun.u_echo = {
+++				.identifier = BR_MC_WAKEUP_ID,
+++				.sequence = 0,
+++			},
+++		},
+++	};
+++
+++	memcpy(&ip6_dst.s6_addr32[2], &eth_dst[0], ETH_ALEN / 2);
+++	memcpy(&ip6_dst.s6_addr[13], &eth_dst[3], ETH_ALEN / 2);
+++	ip6_dst.s6_addr[8] ^= 0x02;
+++	if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6_dst, 0,
+++			       &ip6_src))
+++		return NULL;
+++
+++	skb = netdev_alloc_skb_ip_align(br->dev, sizeof(*pkt));
+++	if (!skb)
+++		return NULL;
+++
+++	skb->protocol = htons(ETH_P_IPV6);
+++	skb->dev = port->dev;
+++
+++	pkt = (struct wakeupcall_pkt *)skb->data;
+++	*pkt = __pkt_template;
+++
+++	ether_addr_copy(pkt->ethhdr.h_source, br->dev->dev_addr);
+++	ether_addr_copy(pkt->ethhdr.h_dest, eth_dst);
+++
+++	pkt->ip6hdr.saddr = ip6_src;
+++	pkt->ip6hdr.daddr = ip6_dst;
+++
+++	csum_part = csum_partial(&pkt->echohdr, sizeof(pkt->echohdr), 0);
+++	csum = csum_ipv6_magic(&ip6_src, &ip6_dst, sizeof(pkt->echohdr),
+++			       IPPROTO_ICMPV6, csum_part);
+++	pkt->echohdr.icmp6_cksum = csum;
+++
+++	skb_reset_mac_header(skb);
+++	skb_set_network_header(skb, offsetof(struct wakeupcall_pkt, ip6hdr));
+++	skb_set_transport_header(skb, offsetof(struct wakeupcall_pkt, echohdr));
+++	skb_put(skb, sizeof(*pkt));
+++	__skb_pull(skb, sizeof(pkt->ethhdr));
+++
+++	return skb;
+++}
+++
+++void br_multicast_send_wakeupcall(struct timer_list *t)
+++{
+++	struct net_bridge_fdb_entry *fdb = from_timer(fdb, t, wakeupcall_timer);
+++	struct net_bridge_port *port = fdb->dst;
+++	struct net_bridge *br = port->br;
+++	struct sk_buff *skb, *skb0;
+++	int i;
+++
+++	skb0 = br_multicast_alloc_wakeupcall(br, port, fdb->key.addr.addr);
+++	if (!skb0)
+++		return;
+++
+++	for (i = port->wakeupcall_num_rings; i > 0; i--) {
+++		if (i > 1) {
+++			skb = skb_clone(skb0, GFP_ATOMIC);
+++			if (!skb) {
+++				kfree_skb(skb0);
+++				break;
+++			}
+++		} else {
+++			skb = skb0;
+++		}
+++
+++		NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT,
+++			dev_net(port->dev), NULL, skb, NULL, skb->dev,
+++			br_dev_queue_push_xmit);
+++	}
+++}
+++
+++static void
+++br_multicast_schedule_wakeupcalls(struct net_bridge_mcast *brmctx,
+++				  struct net_bridge_mcast_port *pmctx,
+++				  const struct in6_addr *group)
+++{
+++	struct net_bridge_fdb_entry *fdb;
+++	unsigned long delay;
+++
+++	rcu_read_lock();
+++	hlist_for_each_entry_rcu(fdb, &brmctx->br->fdb_list, fdb_node) {
+++		if (!fdb->dst || fdb->dst->dev != pmctx->port->dev)
+++			continue;
+++
+++		/* Wake-up calls to VLANs unsupported for now */
+++		if (fdb->key.vlan_id)
+++			continue;
+++
+++		/* Spread the ICMPv6 Echo Requests to avoid congestion.
+++		 * We then won't use a max response delay for the queries later,
+++		 * as that would be redundant. Spread randomly by a little less
+++		 * than max response delay to anticipate the extra round trip.
+++		 */
+++		delay =	ipv6_addr_any(group) ?
+++				brmctx->multicast_query_response_interval :
+++				brmctx->multicast_last_member_interval;
+++		delay = get_random_u32_below(3 * delay / 4);
+++
+++		timer_reduce(&fdb->wakeupcall_timer, jiffies + delay);
+++	}
+++	rcu_read_unlock();
+++}
+++#endif /* CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS */
+++
++ static void __br_multicast_send_query(struct net_bridge_mcast *brmctx,
++ 				      struct net_bridge_mcast_port *pmctx,
++ 				      struct net_bridge_port_group *pg,
++@@ -1809,6 +1977,13 @@ static void __br_multicast_send_query(struct net_bridge_mcast *brmctx,
++ 			dev_net(pmctx->port->dev), NULL, skb, NULL, skb->dev,
++ 			br_dev_queue_push_xmit);
++ 
+++#ifdef CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS
+++		if (pmctx->port->wakeupcall_num_rings &&
+++		    group->proto == htons(ETH_P_IPV6))
+++			br_multicast_schedule_wakeupcalls(brmctx, pmctx,
+++							  &group->dst.ip6);
+++#endif
+++
++ 		if (over_lmqt && with_srcs && sflag) {
++ 			over_lmqt = false;
++ 			goto again_under_lmqt;
++@@ -3976,6 +4151,99 @@ int br_multicast_rcv(struct net_bridge_mcast **brmctx,
++ 	return ret;
++ }
++ 
+++#ifdef CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS
+++
+++static bool br_multicast_wakeupcall_check(struct net_bridge *br,
+++					  struct net_bridge_port *port,
+++					  struct sk_buff *skb, u16 vid)
+++{
+++	struct ethhdr *eth = eth_hdr(skb);
+++	const struct ipv6hdr *ip6h;
+++	unsigned int offset, len;
+++	struct icmp6hdr *icmp6h;
+++
+++	/* Wake-up calls to VLANs unsupported for now */
+++	if (!port->wakeupcall_num_rings || vid ||
+++	    eth->h_proto != htons(ETH_P_IPV6))
+++		return false;
+++
+++	if (!ether_addr_equal(eth->h_dest, br->dev->dev_addr) ||
+++	    is_multicast_ether_addr(eth->h_source) ||
+++	    is_zero_ether_addr(eth->h_source))
+++		return false;
+++
+++	offset = skb_network_offset(skb) + sizeof(*ip6h);
+++	if (!pskb_may_pull(skb, offset))
+++		return false;
+++
+++	ip6h = ipv6_hdr(skb);
+++
+++	if (ip6h->version != 6)
+++		return false;
+++
+++	len = offset + ntohs(ip6h->payload_len);
+++	if (skb->len < len || len <= offset)
+++		return false;
+++
+++	if (ip6h->nexthdr != IPPROTO_ICMPV6)
+++		return false;
+++
+++	skb_set_transport_header(skb, offset);
+++
+++	if (ipv6_mc_check_icmpv6(skb) < 0)
+++		return false;
+++
+++	icmp6h = (struct icmp6hdr *)skb_transport_header(skb);
+++	if (icmp6h->icmp6_type != ICMPV6_ECHO_REPLY ||
+++	    icmp6h->icmp6_dataun.u_echo.identifier != BR_MC_WAKEUP_ID)
+++		return false;
+++
+++	return true;
+++}
+++
+++static void br_multicast_wakeupcall_send_mldq(struct net_bridge_mcast *brmctx,
+++					      struct net_bridge_mcast_port *pmctx,
+++					      const u8 *eth_dst)
+++{
+++	const struct in6_addr group = BR_MC_IN6_ZERO;
+++	struct in6_addr ip6_dst;
+++	struct sk_buff *skb;
+++	u8 igmp_type;
+++
+++	/* we might have been triggered by multicast-address-specific query
+++	 * but reply with a general MLD query for now to keep things simple
+++	 */
+++	ipv6_addr_set(&ip6_dst, htonl(0xff020000), 0, 0, htonl(1));
+++
+++	skb = br_ip6_multicast_alloc_query(brmctx, pmctx, NULL, &ip6_dst,
+++					   &group, false, false, false,
+++					   &igmp_type, NULL, false);
+++	if (!skb)
+++		return;
+++
+++	skb->dev = pmctx->port->dev;
+++	ether_addr_copy(eth_hdr(skb)->h_dest, eth_dst);
+++
+++	br_multicast_count(brmctx->br, pmctx->port, skb, igmp_type,
+++			   BR_MCAST_DIR_TX);
+++	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT,
+++		dev_net(pmctx->port->dev), NULL, skb, NULL, skb->dev,
+++		br_dev_queue_push_xmit);
+++}
+++
+++void br_multicast_wakeupcall_rcv(struct net_bridge_mcast *brmctx,
+++				 struct net_bridge_mcast_port *pmctx,
+++				 struct sk_buff *skb, u16 vid)
+++{
+++	if (!br_multicast_wakeupcall_check(brmctx->br, pmctx->port, skb, vid))
+++		return;
+++
+++	br_multicast_wakeupcall_send_mldq(brmctx, pmctx,
+++					  eth_hdr(skb)->h_source);
+++}
+++
+++#endif /* CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS */
+++
++ static void br_multicast_query_expired(struct net_bridge_mcast *brmctx,
++ 				       struct bridge_mcast_own_query *query,
++ 				       struct bridge_mcast_querier *querier)
++@@ -4504,6 +4772,15 @@ int br_multicast_set_vlan_router(struct net_bridge_vlan *v, u8 mcast_router)
++ 	return err;
++ }
++ 
+++int br_multicast_set_wakeupcall(struct net_bridge_port *p, unsigned long val)
+++{
+++	if (val > U8_MAX)
+++		return -EINVAL;
+++
+++	p->wakeupcall_num_rings = val;
+++	return 0;
+++}
+++
++ static void br_multicast_start_querier(struct net_bridge_mcast *brmctx,
++ 				       struct bridge_mcast_own_query *query)
++ {
++diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
++index a760d5a5ad12..8fdabad8e10a 100644
++--- a/net/bridge/br_netlink.c
+++++ b/net/bridge/br_netlink.c
++@@ -206,6 +206,9 @@ static inline size_t br_port_info_size(void)
++ 		+ nla_total_size(sizeof(u8))	/* IFLA_BRPORT_MULTICAST_ROUTER */
++ 		+ nla_total_size(sizeof(u32))	/* IFLA_BRPORT_MCAST_N_GROUPS */
++ 		+ nla_total_size(sizeof(u32))	/* IFLA_BRPORT_MCAST_MAX_GROUPS */
+++#endif
+++#ifdef CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS
+++		+ nla_total_size(sizeof(u8))	/* IFLA_BRPORT_MCAST_WAKEUPCALL */
++ #endif
++ 		+ nla_total_size(sizeof(u16))	/* IFLA_BRPORT_GROUP_FWD_MASK */
++ 		+ nla_total_size(sizeof(u8))	/* IFLA_BRPORT_MRP_RING_OPEN */
++@@ -313,6 +316,11 @@ static int br_port_fill_attrs(struct sk_buff *skb,
++ 			br_multicast_ngroups_get_max(&p->multicast_ctx)))
++ 		return -EMSGSIZE;
++ #endif
+++#ifdef CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS
+++	if (nla_put_u8(skb, IFLA_BRPORT_MCAST_WAKEUPCALL,
+++		       p->wakeupcall_num_rings))
+++		return -EMSGSIZE;
+++#endif
++ 
++ 	/* we might be called only with br->lock */
++ 	rcu_read_lock();
++@@ -890,6 +898,7 @@ static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = {
++ 	[IFLA_BRPORT_PROXYARP_WIFI] = { .type = NLA_U8 },
++ 	[IFLA_BRPORT_MULTICAST_ROUTER] = { .type = NLA_U8 },
++ 	[IFLA_BRPORT_MCAST_TO_UCAST] = { .type = NLA_U8 },
+++	[IFLA_BRPORT_MCAST_WAKEUPCALL] = { .type = NLA_U8 },
++ 	[IFLA_BRPORT_MCAST_FLOOD] = { .type = NLA_U8 },
++ 	[IFLA_BRPORT_BCAST_FLOOD] = { .type = NLA_U8 },
++ 	[IFLA_BRPORT_VLAN_TUNNEL] = { .type = NLA_U8 },
++@@ -1051,6 +1060,16 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[],
++ 	}
++ #endif
++ 
+++#ifdef CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS
+++	if (tb[IFLA_BRPORT_MCAST_WAKEUPCALL]) {
+++		u8 wakeupcall = nla_get_u8(tb[IFLA_BRPORT_MCAST_WAKEUPCALL]);
+++
+++		err = br_multicast_set_wakeupcall(p, wakeupcall);
+++		if (err)
+++			return err;
+++	}
+++#endif
+++
++ 	if (tb[IFLA_BRPORT_GROUP_FWD_MASK]) {
++ 		u16 fwd_mask = nla_get_u16(tb[IFLA_BRPORT_GROUP_FWD_MASK]);
++ 
++diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
++index 72d80fd943a8..b237c39edd35 100644
++--- a/net/bridge/br_private.h
+++++ b/net/bridge/br_private.h
++@@ -294,6 +294,10 @@ struct net_bridge_fdb_entry {
++ 	unsigned long			used;
++ 
++ 	struct rcu_head			rcu;
+++
+++#ifdef CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS
+++	struct timer_list		wakeupcall_timer;
+++#endif
++ };
++ 
++ struct net_bridge_fdb_flush_desc {
++@@ -417,6 +421,7 @@ struct net_bridge_port {
++ 	u32				multicast_eht_hosts_limit;
++ 	u32				multicast_eht_hosts_cnt;
++ 	struct hlist_head		mglist;
+++	u8				wakeupcall_num_rings;
++ #endif
++ 
++ #ifdef CONFIG_SYSFS
++@@ -1504,6 +1509,21 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1,
++ }
++ #endif
++ 
+++#ifdef CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS
+++void br_multicast_wakeupcall_rcv(struct net_bridge_mcast *brmctx,
+++				 struct net_bridge_mcast_port *pmctx,
+++				 struct sk_buff *skb, u16 vid);
+++void br_multicast_send_wakeupcall(struct timer_list *t);
+++int br_multicast_set_wakeupcall(struct net_bridge_port *p, unsigned long val);
+++#else
+++static inline void
+++br_multicast_wakeupcall_rcv(struct net_bridge_mcast *brmctx,
+++			    struct net_bridge_mcast_port *pmctx,
+++			    struct sk_buff *skb, u16 vid)
+++{
+++}
+++#endif /* CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS */
+++
++ /* br_vlan.c */
++ #ifdef CONFIG_BRIDGE_VLAN_FILTERING
++ bool br_allowed_ingress(const struct net_bridge *br,
++diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
++index aee7c5902206..15ee27e1aa72 100644
++--- a/net/bridge/br_sysfs_if.c
+++++ b/net/bridge/br_sysfs_if.c
++@@ -260,6 +260,21 @@ BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE);
++ BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UNICAST);
++ #endif
++ 
+++#ifdef CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS
+++static ssize_t show_multicast_wakeupcall(struct net_bridge_port *p, char *buf)
+++{
+++	return sprintf(buf, "%d\n", p->wakeupcall_num_rings);
+++}
+++
+++static int store_multicast_wakeupcall(struct net_bridge_port *p,
+++				      unsigned long v)
+++{
+++	return br_multicast_set_wakeupcall(p, v);
+++}
+++static BRPORT_ATTR(multicast_wakeupcall, 0644, show_multicast_wakeupcall,
+++		   store_multicast_wakeupcall);
+++#endif
+++
++ static const struct brport_attribute *brport_attrs[] = {
++ 	&brport_attr_path_cost,
++ 	&brport_attr_priority,
++@@ -285,6 +300,9 @@ static const struct brport_attribute *brport_attrs[] = {
++ 	&brport_attr_multicast_router,
++ 	&brport_attr_multicast_fast_leave,
++ 	&brport_attr_multicast_to_unicast,
+++#endif
+++#ifdef CONFIG_BRIDGE_IGMP_SNOOPING_WAKEUPCALLS
+++	&brport_attr_multicast_wakeupcall,
++ #endif
++ 	&brport_attr_proxyarp,
++ 	&brport_attr_proxyarp_wifi,
++diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
++index 71797d44af4c..abe17f8c4939 100644
++--- a/net/core/rtnetlink.c
+++++ b/net/core/rtnetlink.c
++@@ -61,7 +61,7 @@
++ #include "dev.h"
++ 
++ #define RTNL_MAX_TYPE		50
++-#define RTNL_SLAVE_MAX_TYPE	45
+++#define RTNL_SLAVE_MAX_TYPE	46
++ 
++ struct rtnl_link {
++ 	rtnl_doit_func		doit;
++diff --git a/net/ipv6/mcast_snoop.c b/net/ipv6/mcast_snoop.c
++index 04d5fcdfa6e0..9a5061edbaf3 100644
++--- a/net/ipv6/mcast_snoop.c
+++++ b/net/ipv6/mcast_snoop.c
++@@ -131,7 +131,7 @@ static inline __sum16 ipv6_mc_validate_checksum(struct sk_buff *skb)
++ 	return skb_checksum_validate(skb, IPPROTO_ICMPV6, ip6_compute_pseudo);
++ }
++ 
++-static int ipv6_mc_check_icmpv6(struct sk_buff *skb)
+++int ipv6_mc_check_icmpv6(struct sk_buff *skb)
++ {
++ 	unsigned int len = skb_transport_offset(skb) + sizeof(struct icmp6hdr);
++ 	unsigned int transport_len = ipv6_transport_len(skb);
++@@ -150,6 +150,7 @@ static int ipv6_mc_check_icmpv6(struct sk_buff *skb)
++ 
++ 	return 0;
++ }
+++EXPORT_SYMBOL(ipv6_mc_check_icmpv6);
++ 
++ /**
++  * ipv6_mc_check_mld - checks whether this is a sane MLD packet
++-- 
++2.45.2
++

patches/openwrt/0005-mac80211-silence-warning-for-missing-rate-information.patch

+From: David Bauer <mail@david-bauer.net>
+Date: Thu, 18 Jan 2024 00:52:09 +0100
+Subject: mac80211: silence warning for missing rate information
+
+Silence warnings for missing rate information.
+
+These warnings do not provide value. Instead, they might rotate more
+crucial information out of the kernel message ringbuffer.
+
+Link: https://github.com/freifunk-gluon/gluon/issues/3160
+
+Signed-off-by: David Bauer <mail@david-bauer.net>
+
+diff --git a/package/kernel/mac80211/patches/subsys/999-silence-missing-rate.patch b/package/kernel/mac80211/patches/subsys/999-silence-missing-rate.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..a34455f78960ded59b60d3d9600823b39fc7b7a2
+--- /dev/null
++++ b/package/kernel/mac80211/patches/subsys/999-silence-missing-rate.patch
+@@ -0,0 +1,11 @@
++--- a/net/mac80211/mesh_hwmp.c
+++++ b/net/mac80211/mesh_hwmp.c
++@@ -350,7 +350,7 @@ u32 airtime_link_metric_get(struct ieee8
++ 			return MAX_METRIC;
++ 
++ 		rate = ewma_mesh_tx_rate_avg_read(&sta->mesh->tx_rate_avg);
++-		if (WARN_ON(!rate))
+++		if (!rate)
++ 			return MAX_METRIC;
++ 
++ 		err = (fail_avg << ARITH_SHIFT) / 100;

patches/openwrt/0006-net-mac80211-override-incompatible-basic-rates-for-mesh.patch

+From: David Bauer <mail@david-bauer.net>
+Date: Mon, 6 Jan 2025 08:30:35 +0100
+Subject: net: mac80211: override incompatible basic-rates for mesh
+
+This is a dirty hack for Gluon.
+
+We assume basic rate setup only affects the rate-controller on the TX
+side. As all devices we support have at least a 802.11n radio and thus
+cover 802.11b as well as 802.11g on 2.4 GHz, they are compatible with
+each other.
+
+As the basic rate was incorrectly set for mesh interfaces in the past,
+connections between mesh neighbors would fail when altering the basic
+rate.
+
+This patch ignores mismatches in the basic-rate field. By doing so, we
+avoid implementing some sort of scheduled switch between wireless
+configurations.
+
+Signed-off-by: David Bauer <mail@david-bauer.net>
+
+diff --git a/package/kernel/mac80211/patches/subsys/995-net-mac80211-override-incompatible-basic-rates-for-m.patch b/package/kernel/mac80211/patches/subsys/995-net-mac80211-override-incompatible-basic-rates-for-m.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..efcf0b4f041bb21184e9cd997bc6caca4729a1fe
+--- /dev/null
++++ b/package/kernel/mac80211/patches/subsys/995-net-mac80211-override-incompatible-basic-rates-for-m.patch
+@@ -0,0 +1,37 @@
++From 091e1eea9e34db7cbf84379021fcbff82887e09a Mon Sep 17 00:00:00 2001
++From: David Bauer <mail@david-bauer.net>
++Date: Mon, 6 Jan 2025 08:23:54 +0100
++Subject: [PATCH] net: mac80211: override incompatible basic-rates for mesh
++
++This is a dirty hack for Gluon.
++
++We assume basic rate setup only affects the rate-controller on the TX
++side. As all devices we support have at least a 802.11n radio and thus
++cover 802.11b as well as 802.11g on 2.4 GHz, they are compatible with
++each other.
++
++As the basic rate was incorrectly set for mesh interfaces in the past,
++connections between mesh neighbors would fail when altering the basic
++rate.
++
++This patch ignores mismatches in the basic-rate field. By doing so, we
++avoid implementing some sort of scheduled switch between wireless
++configurations.
++
++Signed-off-by: David Bauer <mail@david-bauer.net>
++---
++ net/mac80211/mesh.c | 7 +++++--
++ 1 file changed, 5 insertions(+), 2 deletions(-)
++
++--- a/net/mac80211/mesh.c
+++++ b/net/mac80211/mesh.c
++@@ -94,9 +94,6 @@ bool mesh_matches_local(struct ieee80211
++ 	ieee80211_sta_get_rates(sdata, ie, sband->band,
++ 				&basic_rates);
++ 
++-	if (sdata->vif.bss_conf.basic_rates != basic_rates)
++-		return false;
++-
++ 	cfg80211_chandef_create(&sta_chan_def, sdata->vif.bss_conf.chanreq.oper.chan,
++ 				NL80211_CHAN_NO_HT);
++ 	ieee80211_chandef_ht_oper(ie->ht_operation, &sta_chan_def);

patches/openwrt/0007-net-mac80211-force-backwards-compatible-basic-rates.patch

+From: David Bauer <mail@david-bauer.net>
+Date: Tue, 7 Jan 2025 00:49:41 +0100
+Subject: net: mac80211: force backwards compatible basic rates
+
+Force backwards-compatible basic-rates on the mesh interface.
+This is required to maintain backwards-compatible with older
+Gluon releases.
+
+Signed-off-by: David Bauer <mail@david-bauer.net>
+
+diff --git a/package/kernel/mac80211/patches/subsys/996-net-mac80211-always-pretend-1-Mbit-s-as-mesh-basic-r.patch b/package/kernel/mac80211/patches/subsys/996-net-mac80211-always-pretend-1-Mbit-s-as-mesh-basic-r.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..6af899c754dcc58df8e262c2db9be0bd9c347e5e
+--- /dev/null
++++ b/package/kernel/mac80211/patches/subsys/996-net-mac80211-always-pretend-1-Mbit-s-as-mesh-basic-r.patch
+@@ -0,0 +1,66 @@
++From 70c1812fa170ee35cdc576c886bed4bfaae1d23c Mon Sep 17 00:00:00 2001
++From: David Bauer <mail@david-bauer.net>
++Date: Tue, 7 Jan 2025 00:47:33 +0100
++Subject: [PATCH] net: mac80211: force backwards compatible basic rates
++
++Force backwards-compatible basic-rates on the mesh interface.
++This is required to maintain backwards-compatible with older
++Gluon releases.
++
++Signed-off-by: David Bauer <mail@david-bauer.net>
++---
++ net/mac80211/util.c | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++--- a/net/mac80211/mesh.c
+++++ b/net/mac80211/mesh.c
++@@ -954,6 +954,7 @@ ieee80211_mesh_build_beacon(struct ieee8
++ 	struct ieee80211_sub_if_data *sdata;
++ 	int hdr_len = offsetofend(struct ieee80211_mgmt, u.beacon);
++ 	u32 rate_flags;
+++	u32 br_bitfield;
++ 
++ 	sdata = container_of(ifmsh, struct ieee80211_sub_if_data, u.mesh);
++ 
++@@ -1086,8 +1087,16 @@ ieee80211_mesh_build_beacon(struct ieee8
++ 	}
++ 	rcu_read_unlock();
++ 
+++	if (sband->band == NL80211_BAND_2GHZ) {
+++		br_bitfield = BIT(0);
+++	} else if (sband->band == NL80211_BAND_5GHZ) {
+++		br_bitfield = BIT(0) | BIT(2) | BIT(4);
+++	} else {
+++		br_bitfield = sdata->vif.bss_conf.basic_rates;
+++	}
+++
++ 	if (ieee80211_put_srates_elem(skb, sband,
++-				      sdata->vif.bss_conf.basic_rates,
+++				      br_bitfield,
++ 				      rate_flags, 0, WLAN_EID_SUPP_RATES) ||
++ 	    mesh_add_ds_params_ie(sdata, skb))
++ 		goto out_free;
++@@ -1100,7 +1109,7 @@ ieee80211_mesh_build_beacon(struct ieee8
++ 	bcn->tail = bcn->head + bcn->head_len;
++ 
++ 	if (ieee80211_put_srates_elem(skb, sband,
++-				      sdata->vif.bss_conf.basic_rates,
+++				      br_bitfield,
++ 				      rate_flags, 0, WLAN_EID_EXT_SUPP_RATES) ||
++ 	    mesh_add_rsn_ie(sdata, skb) ||
++ 	    mesh_add_ht_cap_ie(sdata, skb) ||
++--- a/net/mac80211/mesh_plink.c
+++++ b/net/mac80211/mesh_plink.c
++@@ -284,6 +284,12 @@ static int mesh_plink_frame_tx(struct ie
++ 			ieee80211_chandef_rate_flags(&sdata->vif.bss_conf.chanreq.oper);
++ 		basic_rates = sdata->vif.bss_conf.basic_rates;
++ 
+++		if (sband->band == NL80211_BAND_2GHZ) {
+++			basic_rates = BIT(0); /* mandatory rate */
+++		} else if (sband->band == NL80211_BAND_5GHZ) {
+++			basic_rates = BIT(0) | BIT(2) | BIT(4); /* mandatory rate */
+++		}
+++
++ 		if (ieee80211_put_srates_elem(skb, sband, basic_rates,
++ 					      rate_flags, 0,
++ 					      WLAN_EID_SUPP_RATES) ||

patches/openwrt/0008-build-include-size-limits-to-device-metadata.patch

+From: David Bauer <mail@david-bauer.net>
+Date: Mon, 11 Dec 2023 14:46:12 +0100
+Subject: build: include size-limits to device-metadata
+
+Include the image and kernel size limitations defined for each device to
+the device metadata JSON.
+
+These informations are only added if defined.
+
+Signed-off-by: David Bauer <mail@david-bauer.net>
+
+diff --git a/include/image.mk b/include/image.mk
+index 6408719bdc48e3e3eed91b8aa97e58aa1b5e42ec..bab5f6b53ec7dffac92576be517c1a48e7b9dadb 100644
+--- a/include/image.mk
++++ b/include/image.mk
+@@ -658,6 +658,8 @@ define Device/Build/initramfs
+ 	VERSION_NUMBER="$(VERSION_NUMBER)" \
+ 	VERSION_CODE="$(VERSION_CODE)" \
+ 	SUPPORTED_DEVICES="$$(SUPPORTED_DEVICES)" \
++	KERNEL_SIZE="$$(KERNEL_SIZE)" \
++	IMAGE_SIZE="$$(IMAGE_SIZE)" \
+ 	$(TOPDIR)/scripts/json_add_image_info.py $$@
+ endef
+ endif
+@@ -792,6 +794,8 @@ define Device/Build/image
+ 	VERSION_NUMBER="$(VERSION_NUMBER)" \
+ 	VERSION_CODE="$(VERSION_CODE)" \
+ 	SUPPORTED_DEVICES="$(SUPPORTED_DEVICES)" \
++	KERNEL_SIZE="$(KERNEL_SIZE)" \
++	IMAGE_SIZE="$(IMAGE_SIZE)" \
+ 	$(TOPDIR)/scripts/json_add_image_info.py $$@
+ 
+ endef
+@@ -846,6 +850,8 @@ define Device/Build/artifact
+ 	VERSION_NUMBER="$(VERSION_NUMBER)" \
+ 	VERSION_CODE="$(VERSION_CODE)" \
+ 	SUPPORTED_DEVICES="$(SUPPORTED_DEVICES)" \
++	KERNEL_SIZE="$(KERNEL_SIZE)" \
++	IMAGE_SIZE="$(IMAGE_SIZE)" \
+ 	$(TOPDIR)/scripts/json_add_image_info.py $$@
+ 
+ endef
+diff --git a/scripts/json_add_image_info.py b/scripts/json_add_image_info.py
+index 915e5f61812578ec9e4e92c5aead2da190a7d8b5..3478cdbf226923433b52129428ac278e390b0ea7 100755
+--- a/scripts/json_add_image_info.py
++++ b/scripts/json_add_image_info.py
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python3
+ 
+-from os import getenv
++from os import getenv, path
+ from pathlib import Path
+ from sys import argv
+ import hashlib
+@@ -35,6 +35,17 @@ def get_titles():
+     return titles
+ 
+ 
++def get_numerical_size(image_size):
++    if image_size.endswith("g"):
++        return int(image_size[:-1]) * 1024 * 1024 * 1024
++    elif image_size.endswith("m"):
++        return int(image_size[:-1]) * 1024 * 1024
++    elif image_size.endswith("k"):
++        return int(image_size[:-1]) * 1024
++    else:
++        return int(image_size)
++
++
+ device_id = getenv("DEVICE_ID")
+ 
+ sha256_hash = hashlib.sha256()
+@@ -52,6 +63,8 @@ if file_path.with_suffix(file_path.suffix + ".sha256sum").exists():
+ else:
+     hash_unsigned = hash_file
+ 
++file_size = path.getsize(file_path)
++
+ file_info = {
+     "metadata_version": 1,
+     "target": "{}/{}".format(getenv("TARGET"), getenv("SUBTARGET")),
+@@ -67,6 +80,7 @@ file_info = {
+                     "name": getenv("FILE_NAME"),
+                     "sha256": hash_file,
+                     "sha256_unsigned": hash_unsigned,
++                    "size": file_size,
+                 }
+             ],
+             "device_packages": getenv("DEVICE_PACKAGES").split(),
+@@ -76,6 +90,17 @@ file_info = {
+     },
+ }
+ 
++if getenv("IMAGE_SIZE") or getenv("KERNEL_SIZE"):
++    file_info["profiles"][device_id]["file_size_limits"] = {}
++    if getenv("IMAGE_SIZE"):
++        file_info["profiles"][device_id]["file_size_limits"]["image"] = get_numerical_size(
++            getenv("IMAGE_SIZE")
++        )
++    if getenv("KERNEL_SIZE"):
++        file_info["profiles"][device_id]["file_size_limits"]["kernel"] = get_numerical_size(
++            getenv("KERNEL_SIZE")
++        )
++
+ if getenv("FILE_FILESYSTEM"):
+     file_info["profiles"][device_id]["images"][0]["filesystem"] = getenv(
+         "FILE_FILESYSTEM"

patches/packages/packages/0001-fastd-remove-random-delay-on-inital-handshake.patch

+From: Nico <github@nicoboehr.de>
+Date: Mon, 26 Apr 2021 14:12:43 +0000
+Subject: fastd: remove random delay on inital handshake
+
+When a peer limit is defined, fastd will by default randomly delay
+the inital handshake. As our gateways delay their handshake to
+better distribute their load, this is undesireable.
+
+diff --git a/net/fastd/patches/0100-remove-random-delay-on-inital-handshake.patch b/net/fastd/patches/0100-remove-random-delay-on-inital-handshake.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..40ca26812bda65d8b08a1034e23d1b2335c77259
+--- /dev/null
++++ b/net/fastd/patches/0100-remove-random-delay-on-inital-handshake.patch
+@@ -0,0 +1,23 @@
++--- a/src/peer.c
+++++ b/src/peer.c
++@@ -322,19 +322,11 @@ static void reset_peer(fastd_peer_t *pee
++ 
++ /**
++    Starts the first handshake with a newly setup peer
++-
++-   If a peer group has a peer limit the handshakes will be delayed between 0 and 3 seconds
++-   make the choice of peers random (it will be biased by the latency, which might or might not be
++-   what a user wants)
++ */
++ static void init_handshake(fastd_peer_t *peer) {
++-	unsigned delay = 0;
++-	if (has_group_config_constraints(peer->group))
++-		delay = fastd_rand(0, 3000);
++-
++ 	peer->state = STATE_HANDSHAKE;
++ 
++-	fastd_peer_schedule_handshake(peer, delay);
+++	fastd_peer_schedule_handshake(peer, 0);
++ }
++ 
++ /** Handles an asynchronous DNS resolve response */