patches/openwrt/0006-generic-vxlan-backport-support-for-VXLAN-over-link-local-IPv6-to-4.9.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 9 Jan 2018 22:38:19 +0100
-Subject: generic: vxlan: backport support for VXLAN over link-local IPv6 to 4.9
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/generic/backport-4.9/095-0001-vxlan-improve-validation-of-address-family-configura.patch b/target/linux/generic/backport-4.9/095-0001-vxlan-improve-validation-of-address-family-configura.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..2114562536675cd59450928f591e70d66f8fc7b9
---- /dev/null
-+++ b/target/linux/generic/backport-4.9/095-0001-vxlan-improve-validation-of-address-family-configura.patch
-@@ -0,0 +1,73 @@
-+From f45ba82cd83d27b5d44d3dc417e0e480ba0d3703 Mon Sep 17 00:00:00 2001
-+Message-Id: <f45ba82cd83d27b5d44d3dc417e0e480ba0d3703.1515533863.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Mon, 19 Jun 2017 10:03:57 +0200
-+Subject: [PATCH 1/4] vxlan: improve validation of address family configuration
-+
-+Address families of source and destination addresses must match, and
-+changelink operations can't change the address family.
-+
-+In addition, always use the VXLAN_F_IPV6 to check if a VXLAN device uses
-+IPv4 or IPv6.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+Signed-off-by: David S. Miller <davem@davemloft.net>
-+[Matthias Schiffer: rebase to v4.9.y]
-+---
-+ drivers/net/vxlan.c | 23 +++++++++++++++--------
-+ 1 file changed, 15 insertions(+), 8 deletions(-)
-+
-+diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-+index 983e941bdf29..fbe8da7fa296 100644
-+--- a/drivers/net/vxlan.c
-++++ b/drivers/net/vxlan.c
-+@@ -2867,12 +2867,20 @@ static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,
-+ 
-+ 	memcpy(&dst->remote_ip, &conf->remote_ip, sizeof(conf->remote_ip));
-+ 
-+-	/* Unless IPv6 is explicitly requested, assume IPv4 */
-+-	if (!dst->remote_ip.sa.sa_family)
-++	if (!dst->remote_ip.sa.sa_family && !conf->saddr.sa.sa_family) {
-++		/* Unless IPv6 is explicitly requested, assume IPv4 */
-+ 		dst->remote_ip.sa.sa_family = AF_INET;
-++		conf->saddr.sa.sa_family = AF_INET;
-++	} else if (!dst->remote_ip.sa.sa_family) {
-++		dst->remote_ip.sa.sa_family = conf->saddr.sa.sa_family;
-++	} else if (!conf->saddr.sa.sa_family) {
-++		conf->saddr.sa.sa_family = dst->remote_ip.sa.sa_family;
-++	}
-++
-++	if (conf->saddr.sa.sa_family != dst->remote_ip.sa.sa_family)
-++		return -EINVAL;
-+ 
-+-	if (dst->remote_ip.sa.sa_family == AF_INET6 ||
-+-	    vxlan->cfg.saddr.sa.sa_family == AF_INET6) {
-++	if (conf->saddr.sa.sa_family == AF_INET6) {
-+ 		if (!IS_ENABLED(CONFIG_IPV6))
-+ 			return -EPFNOSUPPORT;
-+ 		use_ipv6 = true;
-+@@ -2938,11 +2946,9 @@ static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,
-+ 
-+ 	list_for_each_entry(tmp, &vn->vxlan_list, next) {
-+ 		if (tmp->cfg.vni == conf->vni &&
-+-		    (tmp->default_dst.remote_ip.sa.sa_family == AF_INET6 ||
-+-		     tmp->cfg.saddr.sa.sa_family == AF_INET6) == use_ipv6 &&
-+ 		    tmp->cfg.dst_port == vxlan->cfg.dst_port &&
-+-		    (tmp->flags & VXLAN_F_RCV_FLAGS) ==
-+-		    (vxlan->flags & VXLAN_F_RCV_FLAGS)) {
-++		    (tmp->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)) ==
-++		    (vxlan->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6))) {
-+ 			pr_info("duplicate VNI %u\n", be32_to_cpu(conf->vni));
-+ 			return -EEXIST;
-+ 		}
-+@@ -2987,6 +2993,7 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev,
-+ 
-+ 	if (data[IFLA_VXLAN_GROUP]) {
-+ 		conf.remote_ip.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_GROUP]);
-++		conf.remote_ip.sa.sa_family = AF_INET;
-+ 	} else if (data[IFLA_VXLAN_GROUP6]) {
-+ 		if (!IS_ENABLED(CONFIG_IPV6))
-+ 			return -EPFNOSUPPORT;
-+-- 
-+2.15.1
-+
-diff --git a/target/linux/generic/backport-4.9/095-0002-vxlan-check-valid-combinations-of-address-scopes.patch b/target/linux/generic/backport-4.9/095-0002-vxlan-check-valid-combinations-of-address-scopes.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..b38b9977bca192eafe9a0d9b8c36a120b3a2c590
---- /dev/null
-+++ b/target/linux/generic/backport-4.9/095-0002-vxlan-check-valid-combinations-of-address-scopes.patch
-@@ -0,0 +1,91 @@
-+From 0eb4ccfc77e07fb4bfc7b1778a7ecb136b47aba4 Mon Sep 17 00:00:00 2001
-+Message-Id: <0eb4ccfc77e07fb4bfc7b1778a7ecb136b47aba4.1515533863.git.mschiffer@universe-factory.net>
-+In-Reply-To: <f45ba82cd83d27b5d44d3dc417e0e480ba0d3703.1515533863.git.mschiffer@universe-factory.net>
-+References: <f45ba82cd83d27b5d44d3dc417e0e480ba0d3703.1515533863.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Mon, 19 Jun 2017 10:03:58 +0200
-+Subject: [PATCH 2/4] vxlan: check valid combinations of address scopes
-+
-+* Multicast addresses are never valid as local address
-+* Link-local IPv6 unicast addresses may only be used as remote when the
-+  local address is link-local as well
-+* Don't allow link-local IPv6 local/remote addresses without interface
-+
-+We also store in the flags field if link-local addresses are used for the
-+follow-up patches that actually make VXLAN over link-local IPv6 work.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+Signed-off-by: David S. Miller <davem@davemloft.net>
-+[Matthias Schiffer: rebase to v4.9.y]
-+---
-+ drivers/net/vxlan.c | 29 +++++++++++++++++++++++++++++
-+ include/net/vxlan.h |  1 +
-+ 2 files changed, 30 insertions(+)
-+
-+diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-+index fbe8da7fa296..863d9528b900 100644
-+--- a/drivers/net/vxlan.c
-++++ b/drivers/net/vxlan.c
-+@@ -2880,11 +2880,35 @@ static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,
-+ 	if (conf->saddr.sa.sa_family != dst->remote_ip.sa.sa_family)
-+ 		return -EINVAL;
-+ 
-++	if (vxlan_addr_multicast(&conf->saddr))
-++		return -EINVAL;
-++
-+ 	if (conf->saddr.sa.sa_family == AF_INET6) {
-+ 		if (!IS_ENABLED(CONFIG_IPV6))
-+ 			return -EPFNOSUPPORT;
-+ 		use_ipv6 = true;
-+ 		vxlan->flags |= VXLAN_F_IPV6;
-++
-++		if (!(conf->flags & VXLAN_F_COLLECT_METADATA)) {
-++			int local_type =
-++				ipv6_addr_type(&conf->saddr.sin6.sin6_addr);
-++			int remote_type =
-++				ipv6_addr_type(&dst->remote_ip.sin6.sin6_addr);
-++
-++			if (local_type & IPV6_ADDR_LINKLOCAL) {
-++				if (!(remote_type & IPV6_ADDR_LINKLOCAL) &&
-++				    (remote_type != IPV6_ADDR_ANY))
-++					return -EINVAL;
-++
-++				vxlan->flags |= VXLAN_F_IPV6_LINKLOCAL;
-++			} else {
-++				if (remote_type ==
-++				    (IPV6_ADDR_UNICAST | IPV6_ADDR_LINKLOCAL))
-++					return -EINVAL;
-++
-++				vxlan->flags &= ~VXLAN_F_IPV6_LINKLOCAL;
-++			}
-++		}
-+ 	}
-+ 
-+ 	if (conf->label && !use_ipv6) {
-+@@ -2918,6 +2942,11 @@ static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,
-+ 	} else if (vxlan_addr_multicast(&dst->remote_ip)) {
-+ 		pr_info("multicast destination requires interface to be specified\n");
-+ 		return -EINVAL;
-++	} else {
-++#if IS_ENABLED(CONFIG_IPV6)
-++		if (vxlan->flags & VXLAN_F_IPV6_LINKLOCAL)
-++			return -EINVAL;
-++#endif
-+ 	}
-+ 
-+ 	if (conf->mtu) {
-+diff --git a/include/net/vxlan.h b/include/net/vxlan.h
-+index 9fce47e3e13e..c1c0d03e3456 100644
-+--- a/include/net/vxlan.h
-++++ b/include/net/vxlan.h
-+@@ -267,6 +267,7 @@ struct vxlan_dev {
-+ #define VXLAN_F_REMCSUM_NOPARTIAL	0x1000
-+ #define VXLAN_F_COLLECT_METADATA	0x2000
-+ #define VXLAN_F_GPE			0x4000
-++#define VXLAN_F_IPV6_LINKLOCAL		0x8000
-+ 
-+ /* Flags that are used in the receive path. These flags must match in
-+  * order for a socket to be shareable
-+-- 
-+2.15.1
-+
-diff --git a/target/linux/generic/backport-4.9/095-0003-vxlan-fix-snooping-for-link-local-IPv6-addresses.patch b/target/linux/generic/backport-4.9/095-0003-vxlan-fix-snooping-for-link-local-IPv6-addresses.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..dcfd1ce7c2f015354d21a65f12f6ebd00331b629
---- /dev/null
-+++ b/target/linux/generic/backport-4.9/095-0003-vxlan-fix-snooping-for-link-local-IPv6-addresses.patch
-@@ -0,0 +1,93 @@
-+From 010b2b541d958e12d78ba1c79734c700f169610b Mon Sep 17 00:00:00 2001
-+Message-Id: <010b2b541d958e12d78ba1c79734c700f169610b.1515533863.git.mschiffer@universe-factory.net>
-+In-Reply-To: <f45ba82cd83d27b5d44d3dc417e0e480ba0d3703.1515533863.git.mschiffer@universe-factory.net>
-+References: <f45ba82cd83d27b5d44d3dc417e0e480ba0d3703.1515533863.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Mon, 19 Jun 2017 10:03:59 +0200
-+Subject: [PATCH 3/4] vxlan: fix snooping for link-local IPv6 addresses
-+
-+If VXLAN is run over link-local IPv6 addresses, it is necessary to store
-+the ifindex in the FDB entries. Otherwise, the used interface is undefined
-+and unicast communication will most likely fail.
-+
-+Support for link-local IPv4 addresses should be possible as well, but as
-+the semantics aren't as well defined as for IPv6, and there doesn't seem to
-+be much interest in having the support, it's not implemented for now.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+Signed-off-by: David S. Miller <davem@davemloft.net>
-+[Matthias Schiffer: rebase to v4.9.y]
-+---
-+ drivers/net/vxlan.c | 20 +++++++++++++++-----
-+ 1 file changed, 15 insertions(+), 5 deletions(-)
-+
-+diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-+index 863d9528b900..c28c6f34b3b3 100644
-+--- a/drivers/net/vxlan.c
-++++ b/drivers/net/vxlan.c
-+@@ -917,16 +917,25 @@ static int vxlan_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
-+  * Return true if packet is bogus and should be dropped.
-+  */
-+ static bool vxlan_snoop(struct net_device *dev,
-+-			union vxlan_addr *src_ip, const u8 *src_mac)
-++			union vxlan_addr *src_ip, const u8 *src_mac,
-++			u32 src_ifindex)
-+ {
-+ 	struct vxlan_dev *vxlan = netdev_priv(dev);
-+ 	struct vxlan_fdb *f;
-++	u32 ifindex = 0;
-++
-++#if IS_ENABLED(CONFIG_IPV6)
-++	if (src_ip->sa.sa_family == AF_INET6 &&
-++	    (ipv6_addr_type(&src_ip->sin6.sin6_addr) & IPV6_ADDR_LINKLOCAL))
-++		ifindex = src_ifindex;
-++#endif
-+ 
-+ 	f = vxlan_find_mac(vxlan, src_mac);
-+ 	if (likely(f)) {
-+ 		struct vxlan_rdst *rdst = first_remote_rcu(f);
-+ 
-+-		if (likely(vxlan_addr_equal(&rdst->remote_ip, src_ip)))
-++		if (likely(vxlan_addr_equal(&rdst->remote_ip, src_ip) &&
-++			   rdst->remote_ifindex == ifindex))
-+ 			return false;
-+ 
-+ 		/* Don't migrate static entries, drop packets */
-+@@ -952,7 +961,7 @@ static bool vxlan_snoop(struct net_device *dev,
-+ 					 NLM_F_EXCL|NLM_F_CREATE,
-+ 					 vxlan->cfg.dst_port,
-+ 					 vxlan->default_dst.remote_vni,
-+-					 0, NTF_SELF);
-++					 ifindex, NTF_SELF);
-+ 		spin_unlock(&vxlan->hash_lock);
-+ 	}
-+ 
-+@@ -1223,6 +1232,7 @@ static bool vxlan_set_mac(struct vxlan_dev *vxlan,
-+ 			  struct sk_buff *skb)
-+ {
-+ 	union vxlan_addr saddr;
-++	u32 ifindex = skb->dev->ifindex;
-+ 
-+ 	skb_reset_mac_header(skb);
-+ 	skb->protocol = eth_type_trans(skb, vxlan->dev);
-+@@ -1244,7 +1254,7 @@ static bool vxlan_set_mac(struct vxlan_dev *vxlan,
-+ 	}
-+ 
-+ 	if ((vxlan->flags & VXLAN_F_LEARN) &&
-+-	    vxlan_snoop(skb->dev, &saddr, eth_hdr(skb)->h_source))
-++	    vxlan_snoop(skb->dev, &saddr, eth_hdr(skb)->h_source, ifindex))
-+ 		return false;
-+ 
-+ 	return true;
-+@@ -1932,7 +1942,7 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
-+ 	}
-+ 
-+ 	if (dst_vxlan->flags & VXLAN_F_LEARN)
-+-		vxlan_snoop(skb->dev, &loopback, eth_hdr(skb)->h_source);
-++		vxlan_snoop(skb->dev, &loopback, eth_hdr(skb)->h_source, 0);
-+ 
-+ 	u64_stats_update_begin(&tx_stats->syncp);
-+ 	tx_stats->tx_packets++;
-+-- 
-+2.15.1
-+
-diff --git a/target/linux/generic/backport-4.9/095-0004-vxlan-allow-multiple-VXLANs-with-same-VNI-for-IPv6-l.patch b/target/linux/generic/backport-4.9/095-0004-vxlan-allow-multiple-VXLANs-with-same-VNI-for-IPv6-l.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..18ae230a3b04d2b57184109fa14f9533f0fb7192
---- /dev/null
-+++ b/target/linux/generic/backport-4.9/095-0004-vxlan-allow-multiple-VXLANs-with-same-VNI-for-IPv6-l.patch
-@@ -0,0 +1,182 @@
-+From 95583c75a95449dade713e1dad4ed0a8dcc1b391 Mon Sep 17 00:00:00 2001
-+Message-Id: <95583c75a95449dade713e1dad4ed0a8dcc1b391.1515533863.git.mschiffer@universe-factory.net>
-+In-Reply-To: <f45ba82cd83d27b5d44d3dc417e0e480ba0d3703.1515533863.git.mschiffer@universe-factory.net>
-+References: <f45ba82cd83d27b5d44d3dc417e0e480ba0d3703.1515533863.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Mon, 19 Jun 2017 10:04:00 +0200
-+Subject: [PATCH 4/4] vxlan: allow multiple VXLANs with same VNI for IPv6
-+ link-local addresses
-+
-+As link-local addresses are only valid for a single interface, we can allow
-+to use the same VNI for multiple independent VXLANs, as long as the used
-+interfaces are distinct. This way, VXLANs can always be used as a drop-in
-+replacement for VLANs with greater ID space.
-+
-+This also extends VNI lookup to respect the ifindex when link-local IPv6
-+addresses are used, so using the same VNI on multiple interfaces can
-+actually work.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+Signed-off-by: David S. Miller <davem@davemloft.net>
-+[Matthias Schiffer: rebase to v4.9.y]
-+---
-+ drivers/net/vxlan.c | 60 ++++++++++++++++++++++++++++++++++++-----------------
-+ 1 file changed, 41 insertions(+), 19 deletions(-)
-+
-+diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-+index c28c6f34b3b3..9208e3d9ec43 100644
-+--- a/drivers/net/vxlan.c
-++++ b/drivers/net/vxlan.c
-+@@ -225,7 +225,8 @@ static struct vxlan_sock *vxlan_find_sock(struct net *net, sa_family_t family,
-+ 	return NULL;
-+ }
-+ 
-+-static struct vxlan_dev *vxlan_vs_find_vni(struct vxlan_sock *vs, __be32 vni)
-++static struct vxlan_dev *vxlan_vs_find_vni(struct vxlan_sock *vs, int ifindex,
-++					   __be32 vni)
-+ {
-+ 	struct vxlan_dev_node *node;
-+ 
-+@@ -234,17 +235,27 @@ static struct vxlan_dev *vxlan_vs_find_vni(struct vxlan_sock *vs, __be32 vni)
-+ 		vni = 0;
-+ 
-+ 	hlist_for_each_entry_rcu(node, vni_head(vs, vni), hlist) {
-+-		if (node->vxlan->default_dst.remote_vni == vni)
-+-			return node->vxlan;
-++		if (node->vxlan->default_dst.remote_vni != vni)
-++			continue;
-++
-++		if (IS_ENABLED(CONFIG_IPV6)) {
-++			const struct vxlan_config *cfg = &node->vxlan->cfg;
-++
-++			if ((node->vxlan->flags & VXLAN_F_IPV6_LINKLOCAL) &&
-++			    cfg->remote_ifindex != ifindex)
-++				continue;
-++		}
-++
-++		return node->vxlan;
-+ 	}
-+ 
-+ 	return NULL;
-+ }
-+ 
-+ /* Look up VNI in a per net namespace table */
-+-static struct vxlan_dev *vxlan_find_vni(struct net *net, __be32 vni,
-+-					sa_family_t family, __be16 port,
-+-					u32 flags)
-++static struct vxlan_dev *vxlan_find_vni(struct net *net, int ifindex,
-++				        __be32 vni, sa_family_t family,
-++					__be16 port, u32 flags)
-+ {
-+ 	struct vxlan_sock *vs;
-+ 
-+@@ -252,7 +263,7 @@ static struct vxlan_dev *vxlan_find_vni(struct net *net, __be32 vni,
-+ 	if (!vs)
-+ 		return NULL;
-+ 
-+-	return vxlan_vs_find_vni(vs, vni);
-++	return vxlan_vs_find_vni(vs, ifindex, vni);
-+ }
-+ 
-+ /* Fill in neighbour message in skbuff. */
-+@@ -1317,7 +1328,8 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
-+ 	if (!vs)
-+ 		goto drop;
-+ 
-+-	vxlan = vxlan_vs_find_vni(vs, vxlan_vni(vxlan_hdr(skb)->vx_vni));
-++	vxlan = vxlan_vs_find_vni(vs, skb->dev->ifindex,
-++                                  vxlan_vni(vxlan_hdr(skb)->vx_vni));
-+ 	if (!vxlan)
-+ 		goto drop;
-+ 
-+@@ -1976,6 +1988,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
-+ 	__be32 vni, label;
-+ 	__be16 df = 0;
-+ 	__u8 tos, ttl;
-++	int ifindex;
-+ 	int err;
-+ 	u32 flags = vxlan->flags;
-+ 	bool udp_sum = false;
-+@@ -1987,6 +2000,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
-+ 	if (rdst) {
-+ 		dst_port = rdst->remote_port ? rdst->remote_port : vxlan->cfg.dst_port;
-+ 		vni = rdst->remote_vni;
-++		ifindex = rdst->remote_ifindex;
-+ 		dst = &rdst->remote_ip;
-+ 		local_ip = vxlan->cfg.saddr;
-+ 		dst_cache = &rdst->dst_cache;
-+@@ -1998,6 +2012,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
-+ 		}
-+ 		dst_port = info->key.tp_dst ? : vxlan->cfg.dst_port;
-+ 		vni = tunnel_id_to_key32(info->key.tun_id);
-++		ifindex = 0;
-+ 		remote_ip.sa.sa_family = ip_tunnel_info_af(info);
-+ 		if (remote_ip.sa.sa_family == AF_INET) {
-+ 			remote_ip.sin.sin_addr.s_addr = info->key.u.ipv4.dst;
-+@@ -2053,7 +2068,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
-+ 		sk = sock4->sock->sk;
-+ 
-+ 		rt = vxlan_get_route(vxlan, skb,
-+-				     rdst ? rdst->remote_ifindex : 0, tos,
-++				     ifindex, tos,
-+ 				     dst->sin.sin_addr.s_addr,
-+ 				     &local_ip.sin.sin_addr.s_addr,
-+ 				     dst_cache, info);
-+@@ -2077,7 +2092,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
-+ 			struct vxlan_dev *dst_vxlan;
-+ 
-+ 			ip_rt_put(rt);
-+-			dst_vxlan = vxlan_find_vni(vxlan->net, vni,
-++			dst_vxlan = vxlan_find_vni(vxlan->net, ifindex, vni,
-+ 						   dst->sa.sa_family, dst_port,
-+ 						   vxlan->flags);
-+ 			if (!dst_vxlan)
-+@@ -2112,7 +2127,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
-+ 		sk = sock6->sock->sk;
-+ 
-+ 		ndst = vxlan6_get_route(vxlan, skb,
-+-					rdst ? rdst->remote_ifindex : 0, tos,
-++					ifindex, tos,
-+ 					label, &dst->sin6.sin6_addr,
-+ 					&local_ip.sin6.sin6_addr,
-+ 					dst_cache, info);
-+@@ -2138,7 +2153,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
-+ 			struct vxlan_dev *dst_vxlan;
-+ 
-+ 			dst_release(ndst);
-+-			dst_vxlan = vxlan_find_vni(vxlan->net, vni,
-++			dst_vxlan = vxlan_find_vni(vxlan->net, ifindex, vni,
-+ 						   dst->sa.sa_family, dst_port,
-+ 						   vxlan->flags);
-+ 			if (!dst_vxlan)
-+@@ -2984,13 +2999,20 @@ static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,
-+ 		vxlan->cfg.age_interval = FDB_AGE_DEFAULT;
-+ 
-+ 	list_for_each_entry(tmp, &vn->vxlan_list, next) {
-+-		if (tmp->cfg.vni == conf->vni &&
-+-		    tmp->cfg.dst_port == vxlan->cfg.dst_port &&
-+-		    (tmp->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)) ==
-+-		    (vxlan->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6))) {
-+-			pr_info("duplicate VNI %u\n", be32_to_cpu(conf->vni));
-+-			return -EEXIST;
-+-		}
-++		if (tmp->cfg.vni != conf->vni)
-++			continue;
-++		if (tmp->cfg.dst_port != vxlan->cfg.dst_port)
-++			continue;
-++		if ((tmp->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)) !=
-++		    (vxlan->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)))
-++			continue;
-++
-++		if ((vxlan->flags & VXLAN_F_IPV6_LINKLOCAL) &&
-++		    tmp->cfg.remote_ifindex != vxlan->cfg.remote_ifindex)
-++			continue;
-++
-++		pr_info("duplicate VNI %u\n", be32_to_cpu(conf->vni));
-++		return -EEXIST;
-+ 	}
-+ 
-+ 	dev->ethtool_ops = &vxlan_ethtool_ops;
-+-- 
-+2.15.1
-+

patches/openwrt/0006-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/0007-kernel-ebtables-add-support-for-ICMP-IGMP-type-matches.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 12 Apr 2018 07:50:02 +0200
-Subject: kernel: ebtables: add support for ICMP/IGMP type matches
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/generic/backport-4.14/096-0001-ebtables-add-support-for-matching-ICMP-type-and-code.patch b/target/linux/generic/backport-4.14/096-0001-ebtables-add-support-for-matching-ICMP-type-and-code.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..9e4d90fb3b8e2c91e4adf0e0efdb3f4575b5027d
---- /dev/null
-+++ b/target/linux/generic/backport-4.14/096-0001-ebtables-add-support-for-matching-ICMP-type-and-code.patch
-@@ -0,0 +1,141 @@
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Sat, 3 Mar 2018 11:55:21 +0100
-+Subject: [PATCH 1/2] ebtables: add support for matching ICMP type and code
-+
-+We already have ICMPv6 type/code matches. This adds support for IPv4 ICMP
-+matches in the same way.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+---
-+ include/uapi/linux/netfilter_bridge/ebt_ip.h | 13 +++++++--
-+ net/bridge/netfilter/ebt_ip.c                | 43 +++++++++++++++++++++-------
-+ 2 files changed, 43 insertions(+), 13 deletions(-)
-+
-+diff --git a/include/uapi/linux/netfilter_bridge/ebt_ip.h b/include/uapi/linux/netfilter_bridge/ebt_ip.h
-+index 8e462fb1983f..4ed7fbb0a482 100644
-+--- a/include/uapi/linux/netfilter_bridge/ebt_ip.h
-++++ b/include/uapi/linux/netfilter_bridge/ebt_ip.h
-+@@ -24,8 +24,9 @@
-+ #define EBT_IP_PROTO 0x08
-+ #define EBT_IP_SPORT 0x10
-+ #define EBT_IP_DPORT 0x20
-++#define EBT_IP_ICMP 0x40
-+ #define EBT_IP_MASK (EBT_IP_SOURCE | EBT_IP_DEST | EBT_IP_TOS | EBT_IP_PROTO |\
-+- EBT_IP_SPORT | EBT_IP_DPORT )
-++		     EBT_IP_SPORT | EBT_IP_DPORT | EBT_IP_ICMP)
-+ #define EBT_IP_MATCH "ip"
-+ 
-+ /* the same values are used for the invflags */
-+@@ -38,8 +39,14 @@ struct ebt_ip_info {
-+ 	__u8  protocol;
-+ 	__u8  bitmask;
-+ 	__u8  invflags;
-+-	__u16 sport[2];
-+-	__u16 dport[2];
-++	union {
-++		__u16 sport[2];
-++		__u8 icmp_type[2];
-++	};
-++	union {
-++		__u16 dport[2];
-++		__u8 icmp_code[2];
-++	};
-+ };
-+ 
-+ #endif
-+diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c
-+index 2b46c50abce0..8cb8f8395768 100644
-+--- a/net/bridge/netfilter/ebt_ip.c
-++++ b/net/bridge/netfilter/ebt_ip.c
-+@@ -19,9 +19,15 @@
-+ #include <linux/netfilter_bridge/ebtables.h>
-+ #include <linux/netfilter_bridge/ebt_ip.h>
-+ 
-+-struct tcpudphdr {
-+-	__be16 src;
-+-	__be16 dst;
-++union pkthdr {
-++	struct {
-++		__be16 src;
-++		__be16 dst;
-++	} tcpudphdr;
-++	struct {
-++		u8 type;
-++		u8 code;
-++	} icmphdr;
-+ };
-+ 
-+ static bool
-+@@ -30,8 +36,8 @@ ebt_ip_mt(const struct sk_buff *skb, struct xt_action_param *par)
-+ 	const struct ebt_ip_info *info = par->matchinfo;
-+ 	const struct iphdr *ih;
-+ 	struct iphdr _iph;
-+-	const struct tcpudphdr *pptr;
-+-	struct tcpudphdr _ports;
-++	const union pkthdr *pptr;
-++	union pkthdr _pkthdr;
-+ 
-+ 	ih = skb_header_pointer(skb, 0, sizeof(_iph), &_iph);
-+ 	if (ih == NULL)
-+@@ -50,29 +56,38 @@ ebt_ip_mt(const struct sk_buff *skb, struct xt_action_param *par)
-+ 	if (info->bitmask & EBT_IP_PROTO) {
-+ 		if (NF_INVF(info, EBT_IP_PROTO, info->protocol != ih->protocol))
-+ 			return false;
-+-		if (!(info->bitmask & EBT_IP_DPORT) &&
-+-		    !(info->bitmask & EBT_IP_SPORT))
-++		if (!(info->bitmask & (EBT_IP_DPORT | EBT_IP_SPORT |
-++				       EBT_IP_ICMP)))
-+ 			return true;
-+ 		if (ntohs(ih->frag_off) & IP_OFFSET)
-+ 			return false;
-++
-++		/* min icmp headersize is 4, so sizeof(_pkthdr) is ok. */
-+ 		pptr = skb_header_pointer(skb, ih->ihl*4,
-+-					  sizeof(_ports), &_ports);
-++					  sizeof(_pkthdr), &_pkthdr);
-+ 		if (pptr == NULL)
-+ 			return false;
-+ 		if (info->bitmask & EBT_IP_DPORT) {
-+-			u32 dst = ntohs(pptr->dst);
-++			u32 dst = ntohs(pptr->tcpudphdr.dst);
-+ 			if (NF_INVF(info, EBT_IP_DPORT,
-+ 				    dst < info->dport[0] ||
-+ 				    dst > info->dport[1]))
-+ 				return false;
-+ 		}
-+ 		if (info->bitmask & EBT_IP_SPORT) {
-+-			u32 src = ntohs(pptr->src);
-++			u32 src = ntohs(pptr->tcpudphdr.src);
-+ 			if (NF_INVF(info, EBT_IP_SPORT,
-+ 				    src < info->sport[0] ||
-+ 				    src > info->sport[1]))
-+ 				return false;
-+ 		}
-++		if ((info->bitmask & EBT_IP_ICMP) &&
-++		    NF_INVF(info, EBT_IP_ICMP,
-++			    pptr->icmphdr.type < info->icmp_type[0] ||
-++			    pptr->icmphdr.type > info->icmp_type[1] ||
-++			    pptr->icmphdr.code < info->icmp_code[0] ||
-++			    pptr->icmphdr.code > info->icmp_code[1]))
-++			return false;
-+ 	}
-+ 	return true;
-+ }
-+@@ -101,6 +116,14 @@ static int ebt_ip_mt_check(const struct xt_mtchk_param *par)
-+ 		return -EINVAL;
-+ 	if (info->bitmask & EBT_IP_SPORT && info->sport[0] > info->sport[1])
-+ 		return -EINVAL;
-++	if (info->bitmask & EBT_IP_ICMP) {
-++		if ((info->invflags & EBT_IP_PROTO) ||
-++		    info->protocol != IPPROTO_ICMP)
-++			return -EINVAL;
-++		if (info->icmp_type[0] > info->icmp_type[1] ||
-++		    info->icmp_code[0] > info->icmp_code[1])
-++			return -EINVAL;
-++	}
-+ 	return 0;
-+ }
-+ 
-+-- 
-+2.16.2
-+
-diff --git a/target/linux/generic/backport-4.14/096-0002-ebtables-add-support-for-matching-IGMP-type.patch b/target/linux/generic/backport-4.14/096-0002-ebtables-add-support-for-matching-IGMP-type.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..35b93adc802c2850cd6ee218c3d7d6f6c53bba29
---- /dev/null
-+++ b/target/linux/generic/backport-4.14/096-0002-ebtables-add-support-for-matching-IGMP-type.patch
-@@ -0,0 +1,95 @@
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Sat, 3 Mar 2018 12:02:21 +0100
-+Subject: [PATCH 2/2] ebtables: add support for matching IGMP type
-+
-+We already have ICMPv6 type/code matches (which can be used to distinguish
-+different types of MLD packets). Add support for IPv4 IGMP matches in the
-+same way.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+---
-+ include/uapi/linux/netfilter_bridge/ebt_ip.h |  4 +++-
-+ net/bridge/netfilter/ebt_ip.c                | 19 +++++++++++++++++--
-+ 2 files changed, 20 insertions(+), 3 deletions(-)
-+
-+diff --git a/include/uapi/linux/netfilter_bridge/ebt_ip.h b/include/uapi/linux/netfilter_bridge/ebt_ip.h
-+index 4ed7fbb0a482..46d6261370b0 100644
-+--- a/include/uapi/linux/netfilter_bridge/ebt_ip.h
-++++ b/include/uapi/linux/netfilter_bridge/ebt_ip.h
-+@@ -25,8 +25,9 @@
-+ #define EBT_IP_SPORT 0x10
-+ #define EBT_IP_DPORT 0x20
-+ #define EBT_IP_ICMP 0x40
-++#define EBT_IP_IGMP 0x80
-+ #define EBT_IP_MASK (EBT_IP_SOURCE | EBT_IP_DEST | EBT_IP_TOS | EBT_IP_PROTO |\
-+-		     EBT_IP_SPORT | EBT_IP_DPORT | EBT_IP_ICMP)
-++		     EBT_IP_SPORT | EBT_IP_DPORT | EBT_IP_ICMP | EBT_IP_IGMP)
-+ #define EBT_IP_MATCH "ip"
-+ 
-+ /* the same values are used for the invflags */
-+@@ -42,6 +43,7 @@ struct ebt_ip_info {
-+ 	union {
-+ 		__u16 sport[2];
-+ 		__u8 icmp_type[2];
-++		__u8 igmp_type[2];
-+ 	};
-+ 	union {
-+ 		__u16 dport[2];
-+diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c
-+index 8cb8f8395768..ffaa8ce2e724 100644
-+--- a/net/bridge/netfilter/ebt_ip.c
-++++ b/net/bridge/netfilter/ebt_ip.c
-+@@ -28,6 +28,9 @@ union pkthdr {
-+ 		u8 type;
-+ 		u8 code;
-+ 	} icmphdr;
-++	struct {
-++		u8 type;
-++	} igmphdr;
-+ };
-+ 
-+ static bool
-+@@ -57,12 +60,12 @@ ebt_ip_mt(const struct sk_buff *skb, struct xt_action_param *par)
-+ 		if (NF_INVF(info, EBT_IP_PROTO, info->protocol != ih->protocol))
-+ 			return false;
-+ 		if (!(info->bitmask & (EBT_IP_DPORT | EBT_IP_SPORT |
-+-				       EBT_IP_ICMP)))
-++				       EBT_IP_ICMP | EBT_IP_IGMP)))
-+ 			return true;
-+ 		if (ntohs(ih->frag_off) & IP_OFFSET)
-+ 			return false;
-+ 
-+-		/* min icmp headersize is 4, so sizeof(_pkthdr) is ok. */
-++		/* min icmp/igmp headersize is 4, so sizeof(_pkthdr) is ok. */
-+ 		pptr = skb_header_pointer(skb, ih->ihl*4,
-+ 					  sizeof(_pkthdr), &_pkthdr);
-+ 		if (pptr == NULL)
-+@@ -88,6 +91,11 @@ ebt_ip_mt(const struct sk_buff *skb, struct xt_action_param *par)
-+ 			    pptr->icmphdr.code < info->icmp_code[0] ||
-+ 			    pptr->icmphdr.code > info->icmp_code[1]))
-+ 			return false;
-++		if ((info->bitmask & EBT_IP_IGMP) &&
-++		    NF_INVF(info, EBT_IP_IGMP,
-++			    pptr->igmphdr.type < info->igmp_type[0] ||
-++			    pptr->igmphdr.type > info->igmp_type[1]))
-++			return false;
-+ 	}
-+ 	return true;
-+ }
-+@@ -124,6 +132,13 @@ static int ebt_ip_mt_check(const struct xt_mtchk_param *par)
-+ 		    info->icmp_code[0] > info->icmp_code[1])
-+ 			return -EINVAL;
-+ 	}
-++	if (info->bitmask & EBT_IP_IGMP) {
-++		if ((info->invflags & EBT_IP_PROTO) ||
-++		    info->protocol != IPPROTO_IGMP)
-++			return -EINVAL;
-++		if (info->igmp_type[0] > info->igmp_type[1])
-++			return -EINVAL;
-++	}
-+ 	return 0;
-+ }
-+ 
-+-- 
-+2.16.2
-+
-diff --git a/target/linux/generic/backport-4.9/096-0001-ebtables-add-support-for-matching-ICMP-type-and-code.patch b/target/linux/generic/backport-4.9/096-0001-ebtables-add-support-for-matching-ICMP-type-and-code.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..db82fd6b69b3c4e279f39db7ca4b415498457e75
---- /dev/null
-+++ b/target/linux/generic/backport-4.9/096-0001-ebtables-add-support-for-matching-ICMP-type-and-code.patch
-@@ -0,0 +1,141 @@
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Sat, 3 Mar 2018 11:55:21 +0100
-+Subject: [PATCH 1/2] ebtables: add support for matching ICMP type and code
-+
-+We already have ICMPv6 type/code matches. This adds support for IPv4 ICMP
-+matches in the same way.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+---
-+ include/uapi/linux/netfilter_bridge/ebt_ip.h | 13 +++++++--
-+ net/bridge/netfilter/ebt_ip.c                | 43 +++++++++++++++++++++-------
-+ 2 files changed, 43 insertions(+), 13 deletions(-)
-+
-+diff --git a/include/uapi/linux/netfilter_bridge/ebt_ip.h b/include/uapi/linux/netfilter_bridge/ebt_ip.h
-+index c4bbc41b0ea4..63a2860ae1e3 100644
-+--- a/include/uapi/linux/netfilter_bridge/ebt_ip.h
-++++ b/include/uapi/linux/netfilter_bridge/ebt_ip.h
-+@@ -23,8 +23,9 @@
-+ #define EBT_IP_PROTO 0x08
-+ #define EBT_IP_SPORT 0x10
-+ #define EBT_IP_DPORT 0x20
-++#define EBT_IP_ICMP 0x40
-+ #define EBT_IP_MASK (EBT_IP_SOURCE | EBT_IP_DEST | EBT_IP_TOS | EBT_IP_PROTO |\
-+- EBT_IP_SPORT | EBT_IP_DPORT )
-++		     EBT_IP_SPORT | EBT_IP_DPORT | EBT_IP_ICMP)
-+ #define EBT_IP_MATCH "ip"
-+ 
-+ /* the same values are used for the invflags */
-+@@ -37,8 +38,14 @@ struct ebt_ip_info {
-+ 	__u8  protocol;
-+ 	__u8  bitmask;
-+ 	__u8  invflags;
-+-	__u16 sport[2];
-+-	__u16 dport[2];
-++	union {
-++		__u16 sport[2];
-++		__u8 icmp_type[2];
-++	};
-++	union {
-++		__u16 dport[2];
-++		__u8 icmp_code[2];
-++	};
-+ };
-+ 
-+ #endif
-+diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c
-+index d06968bdf5ec..e4fc77072b27 100644
-+--- a/net/bridge/netfilter/ebt_ip.c
-++++ b/net/bridge/netfilter/ebt_ip.c
-+@@ -19,9 +19,15 @@
-+ #include <linux/netfilter_bridge/ebtables.h>
-+ #include <linux/netfilter_bridge/ebt_ip.h>
-+ 
-+-struct tcpudphdr {
-+-	__be16 src;
-+-	__be16 dst;
-++union pkthdr {
-++	struct {
-++		__be16 src;
-++		__be16 dst;
-++	} tcpudphdr;
-++	struct {
-++		u8 type;
-++		u8 code;
-++	} icmphdr;
-+ };
-+ 
-+ static bool
-+@@ -30,8 +36,8 @@ ebt_ip_mt(const struct sk_buff *skb, struct xt_action_param *par)
-+ 	const struct ebt_ip_info *info = par->matchinfo;
-+ 	const struct iphdr *ih;
-+ 	struct iphdr _iph;
-+-	const struct tcpudphdr *pptr;
-+-	struct tcpudphdr _ports;
-++	const union pkthdr *pptr;
-++	union pkthdr _pkthdr;
-+ 
-+ 	ih = skb_header_pointer(skb, 0, sizeof(_iph), &_iph);
-+ 	if (ih == NULL)
-+@@ -50,29 +56,38 @@ ebt_ip_mt(const struct sk_buff *skb, struct xt_action_param *par)
-+ 	if (info->bitmask & EBT_IP_PROTO) {
-+ 		if (NF_INVF(info, EBT_IP_PROTO, info->protocol != ih->protocol))
-+ 			return false;
-+-		if (!(info->bitmask & EBT_IP_DPORT) &&
-+-		    !(info->bitmask & EBT_IP_SPORT))
-++		if (!(info->bitmask & (EBT_IP_DPORT | EBT_IP_SPORT |
-++				       EBT_IP_ICMP)))
-+ 			return true;
-+ 		if (ntohs(ih->frag_off) & IP_OFFSET)
-+ 			return false;
-++
-++		/* min icmp headersize is 4, so sizeof(_pkthdr) is ok. */
-+ 		pptr = skb_header_pointer(skb, ih->ihl*4,
-+-					  sizeof(_ports), &_ports);
-++					  sizeof(_pkthdr), &_pkthdr);
-+ 		if (pptr == NULL)
-+ 			return false;
-+ 		if (info->bitmask & EBT_IP_DPORT) {
-+-			u32 dst = ntohs(pptr->dst);
-++			u32 dst = ntohs(pptr->tcpudphdr.dst);
-+ 			if (NF_INVF(info, EBT_IP_DPORT,
-+ 				    dst < info->dport[0] ||
-+ 				    dst > info->dport[1]))
-+ 			return false;
-+ 		}
-+ 		if (info->bitmask & EBT_IP_SPORT) {
-+-			u32 src = ntohs(pptr->src);
-++			u32 src = ntohs(pptr->tcpudphdr.src);
-+ 			if (NF_INVF(info, EBT_IP_SPORT,
-+ 				    src < info->sport[0] ||
-+ 				    src > info->sport[1]))
-+ 			return false;
-+ 		}
-++		if ((info->bitmask & EBT_IP_ICMP) &&
-++		    NF_INVF(info, EBT_IP_ICMP,
-++			    pptr->icmphdr.type < info->icmp_type[0] ||
-++			    pptr->icmphdr.type > info->icmp_type[1] ||
-++			    pptr->icmphdr.code < info->icmp_code[0] ||
-++			    pptr->icmphdr.code > info->icmp_code[1]))
-++			return false;
-+ 	}
-+ 	return true;
-+ }
-+@@ -101,6 +116,14 @@ static int ebt_ip_mt_check(const struct xt_mtchk_param *par)
-+ 		return -EINVAL;
-+ 	if (info->bitmask & EBT_IP_SPORT && info->sport[0] > info->sport[1])
-+ 		return -EINVAL;
-++	if (info->bitmask & EBT_IP_ICMP) {
-++		if ((info->invflags & EBT_IP_PROTO) ||
-++		    info->protocol != IPPROTO_ICMP)
-++			return -EINVAL;
-++		if (info->icmp_type[0] > info->icmp_type[1] ||
-++		    info->icmp_code[0] > info->icmp_code[1])
-++			return -EINVAL;
-++	}
-+ 	return 0;
-+ }
-+ 
-+-- 
-+2.16.2
-+
-diff --git a/target/linux/generic/backport-4.9/096-0002-ebtables-add-support-for-matching-IGMP-type.patch b/target/linux/generic/backport-4.9/096-0002-ebtables-add-support-for-matching-IGMP-type.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..5750b612fc0f322e0a257f3229b5b698328b428b
---- /dev/null
-+++ b/target/linux/generic/backport-4.9/096-0002-ebtables-add-support-for-matching-IGMP-type.patch
-@@ -0,0 +1,95 @@
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Sat, 3 Mar 2018 12:02:21 +0100
-+Subject: [PATCH 2/2] ebtables: add support for matching IGMP type
-+
-+We already have ICMPv6 type/code matches (which can be used to distinguish
-+different types of MLD packets). Add support for IPv4 IGMP matches in the
-+same way.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+---
-+ include/uapi/linux/netfilter_bridge/ebt_ip.h |  4 +++-
-+ net/bridge/netfilter/ebt_ip.c                | 19 +++++++++++++++++--
-+ 2 files changed, 20 insertions(+), 3 deletions(-)
-+
-+diff --git a/include/uapi/linux/netfilter_bridge/ebt_ip.h b/include/uapi/linux/netfilter_bridge/ebt_ip.h
-+index 63a2860ae1e3..ae5d4d108418 100644
-+--- a/include/uapi/linux/netfilter_bridge/ebt_ip.h
-++++ b/include/uapi/linux/netfilter_bridge/ebt_ip.h
-+@@ -24,8 +24,9 @@
-+ #define EBT_IP_SPORT 0x10
-+ #define EBT_IP_DPORT 0x20
-+ #define EBT_IP_ICMP 0x40
-++#define EBT_IP_IGMP 0x80
-+ #define EBT_IP_MASK (EBT_IP_SOURCE | EBT_IP_DEST | EBT_IP_TOS | EBT_IP_PROTO |\
-+-		     EBT_IP_SPORT | EBT_IP_DPORT | EBT_IP_ICMP)
-++		     EBT_IP_SPORT | EBT_IP_DPORT | EBT_IP_ICMP | EBT_IP_IGMP)
-+ #define EBT_IP_MATCH "ip"
-+ 
-+ /* the same values are used for the invflags */
-+@@ -41,6 +42,7 @@ struct ebt_ip_info {
-+ 	union {
-+ 		__u16 sport[2];
-+ 		__u8 icmp_type[2];
-++		__u8 igmp_type[2];
-+ 	};
-+ 	union {
-+ 		__u16 dport[2];
-+diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c
-+index e4fc77072b27..57fbb13cb8e0 100644
-+--- a/net/bridge/netfilter/ebt_ip.c
-++++ b/net/bridge/netfilter/ebt_ip.c
-+@@ -28,6 +28,9 @@ union pkthdr {
-+ 		u8 type;
-+ 		u8 code;
-+ 	} icmphdr;
-++	struct {
-++		u8 type;
-++	} igmphdr;
-+ };
-+ 
-+ static bool
-+@@ -57,12 +60,12 @@ ebt_ip_mt(const struct sk_buff *skb, struct xt_action_param *par)
-+ 		if (NF_INVF(info, EBT_IP_PROTO, info->protocol != ih->protocol))
-+ 			return false;
-+ 		if (!(info->bitmask & (EBT_IP_DPORT | EBT_IP_SPORT |
-+-				       EBT_IP_ICMP)))
-++				       EBT_IP_ICMP | EBT_IP_IGMP)))
-+ 			return true;
-+ 		if (ntohs(ih->frag_off) & IP_OFFSET)
-+ 			return false;
-+ 
-+-		/* min icmp headersize is 4, so sizeof(_pkthdr) is ok. */
-++		/* min icmp/igmp headersize is 4, so sizeof(_pkthdr) is ok. */
-+ 		pptr = skb_header_pointer(skb, ih->ihl*4,
-+ 					  sizeof(_pkthdr), &_pkthdr);
-+ 		if (pptr == NULL)
-+@@ -88,6 +91,11 @@ ebt_ip_mt(const struct sk_buff *skb, struct xt_action_param *par)
-+ 			    pptr->icmphdr.code < info->icmp_code[0] ||
-+ 			    pptr->icmphdr.code > info->icmp_code[1]))
-+ 			return false;
-++		if ((info->bitmask & EBT_IP_IGMP) &&
-++		    NF_INVF(info, EBT_IP_IGMP,
-++			    pptr->igmphdr.type < info->igmp_type[0] ||
-++			    pptr->igmphdr.type > info->igmp_type[1]))
-++			return false;
-+ 	}
-+ 	return true;
-+ }
-+@@ -124,6 +132,13 @@ static int ebt_ip_mt_check(const struct xt_mtchk_param *par)
-+ 		    info->icmp_code[0] > info->icmp_code[1])
-+ 			return -EINVAL;
-+ 	}
-++	if (info->bitmask & EBT_IP_IGMP) {
-++		if ((info->invflags & EBT_IP_PROTO) ||
-++		    info->protocol != IPPROTO_IGMP)
-++			return -EINVAL;
-++		if (info->igmp_type[0] > info->igmp_type[1])
-++			return -EINVAL;
-++	}
-+ 	return 0;
-+ }
-+ 
-+-- 
-+2.16.2
-+

patches/openwrt/0007-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/0008-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/0009-mt76-import-MT7915-recovery-fixes.patch

+From: David Bauer <mail@david-bauer.net>
+Date: Fri, 7 Feb 2025 00:17:02 +0100
+Subject: mt76: import MT7915 recovery fixes
+
+diff --git a/package/kernel/mt76/patches/0003-mt7915-mcu-lower-default-timeout.patch b/package/kernel/mt76/patches/0003-mt7915-mcu-lower-default-timeout.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..2f55d42fbffba1d84bff3a89da3281b73f3668de
+--- /dev/null
++++ b/package/kernel/mt76/patches/0003-mt7915-mcu-lower-default-timeout.patch
+@@ -0,0 +1,32 @@
++From 74530440427abcbd20d071f00e25ab0e4c483ea2 Mon Sep 17 00:00:00 2001
++From: David Bauer <mail@david-bauer.net>
++Date: Mon, 13 Jan 2025 08:48:41 +0100
++Subject: [PATCH 3/5] mt7915: mcu: lower default timeout
++
++The default timeout set in mt76_connac2_mcu_fill_message of 20 seconds
++leads to excessive stalling in case messages are lost.
++
++Testing showed that a smaller timeout of  seconds is sufficient in
++normal operation.
++
++Signed-off-by: David Bauer <mail@david-bauer.net>
++---
++ mt7915/mcu.c | 2 ++
++ 1 file changed, 2 insertions(+)
++
++diff --git a/mt7915/mcu.c b/mt7915/mcu.c
++index 9d790f23..51b6e480 100644
++--- a/mt7915/mcu.c
+++++ b/mt7915/mcu.c
++@@ -197,6 +197,8 @@ mt7915_mcu_parse_response(struct mt76_dev *mdev, int cmd,
++ static void
++ mt7915_mcu_set_timeout(struct mt76_dev *mdev, int cmd)
++ {
+++	mdev->mcu.timeout = 5 * HZ;
+++
++ 	if ((cmd & __MCU_CMD_FIELD_ID) != MCU_CMD_EXT_CID)
++ 		return;
++ 
++-- 
++2.47.2
++
+diff --git a/package/kernel/mt76/patches/0004-mt7915-mcu-increase-command-timeout.patch b/package/kernel/mt76/patches/0004-mt7915-mcu-increase-command-timeout.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..5368dcff6623681c40c938efeed171885805e3a9
+--- /dev/null
++++ b/package/kernel/mt76/patches/0004-mt7915-mcu-increase-command-timeout.patch
+@@ -0,0 +1,32 @@
++From 094105e471472e3ea44c4094857ad8a7c6973460 Mon Sep 17 00:00:00 2001
++From: David Bauer <mail@david-bauer.net>
++Date: Mon, 13 Jan 2025 08:51:30 +0100
++Subject: [PATCH 4/5] mt7915: mcu: increase command timeout
++
++Increase the timeout for MCU_EXT_CMD_EFUSE_BUFFER_MODE command.
++
++Regular retries upon hardware-recovery have been observed. Increasing
++the timeout slightly remedies this problem.
++
++Signed-off-by: David Bauer <mail@david-bauer.net>
++---
++ mt7915/mcu.c | 3 +++
++ 1 file changed, 3 insertions(+)
++
++diff --git a/mt7915/mcu.c b/mt7915/mcu.c
++index 51b6e480..cd9cb428 100644
++--- a/mt7915/mcu.c
+++++ b/mt7915/mcu.c
++@@ -210,6 +210,9 @@ mt7915_mcu_set_timeout(struct mt76_dev *mdev, int cmd)
++ 	case MCU_EXT_CMD_BSS_INFO_UPDATE:
++ 		mdev->mcu.timeout = 2 * HZ;
++ 		return;
+++	case MCU_EXT_CMD_EFUSE_BUFFER_MODE:
+++		mdev->mcu.timeout = 10 * HZ;
+++		return;
++ 	default:
++ 		break;
++ 	}
++-- 
++2.47.2
++
+diff --git a/package/kernel/mt76/patches/0005-mt7915-mcu-re-init-MCU-before-loading-FW-patch.patch b/package/kernel/mt76/patches/0005-mt7915-mcu-re-init-MCU-before-loading-FW-patch.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..21b47b1c484edf8b29f3237fd4e02e075b368a31
+--- /dev/null
++++ b/package/kernel/mt76/patches/0005-mt7915-mcu-re-init-MCU-before-loading-FW-patch.patch
+@@ -0,0 +1,55 @@
++From 4e9e3cceea7ace91df52d795e4e45a7acb368a4c Mon Sep 17 00:00:00 2001
++From: David Bauer <mail@david-bauer.net>
++Date: Sun, 12 Jan 2025 15:30:54 +0100
++Subject: [PATCH 5/5] mt7915: mcu: re-init MCU before loading FW patch
++
++Restart the MCU and release the patch semaphore before loading the MCU
++patch firmware from the host.
++
++This fixes failures upon error recovery in case the semaphore was
++previously taken and never released by the host.
++
++Signed-off-by: David Bauer <mail@david-bauer.net>
++---
++ mt7915/mcu.c | 25 +++++++++++++++----------
++ 1 file changed, 15 insertions(+), 10 deletions(-)
++
++diff --git a/mt7915/mcu.c b/mt7915/mcu.c
++index cd9cb428..4121b980 100644
++--- a/mt7915/mcu.c
+++++ b/mt7915/mcu.c
++@@ -2097,16 +2097,21 @@ static int mt7915_load_firmware(struct mt7915_dev *dev)
++ {
++ 	int ret;
++ 
++-	/* make sure fw is download state */
++-	if (mt7915_firmware_state(dev, false)) {
++-		/* restart firmware once */
++-		mt76_connac_mcu_restart(&dev->mt76);
++-		ret = mt7915_firmware_state(dev, false);
++-		if (ret) {
++-			dev_err(dev->mt76.dev,
++-				"Firmware is not ready for download\n");
++-			return ret;
++-		}
+++	/* Release Semaphore if taken by previous failed attempt */
+++	ret = mt76_connac_mcu_patch_sem_ctrl(&dev->mt76, false);
+++	if (ret != PATCH_REL_SEM_SUCCESS) {
+++		dev_err(dev->mt76.dev, "Could not release semaphore\n");
+++		/* Continue anyways */
+++	}
+++
+++	/* Always restart MCU firmware */
+++	mt76_connac_mcu_restart(&dev->mt76);
+++
+++	/* Check if MCU is ready */
+++	ret = mt7915_firmware_state(dev, false);
+++	if (ret) {
+++		dev_err(dev->mt76.dev, "Firmware did not enter download state\n");
+++		return ret;
++ 	}
++ 
++ 	ret = mt76_connac2_load_patch(&dev->mt76, fw_name_var(dev, ROM_PATCH));
++-- 
++2.47.2
++

patches/openwrt/0010-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 */

patches/packages/packages/0002-uradvd-add-patch-to-announce-prefix-with-preferred-lifetime-0.patch

+From: Nico <github@nicoboehr.de>
+Date: Fri, 29 Dec 2023 23:17:27 +0000
+Subject: uradvd: add patch to announce prefix with preferred lifetime 0
+
+diff --git a/net/uradvd/patches/001-uradvd-announce-with-pref-0.patch b/net/uradvd/patches/001-uradvd-announce-with-pref-0.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..7882639d1bfec0923460c93f55fe9f44e58212c1
+--- /dev/null
++++ b/net/uradvd/patches/001-uradvd-announce-with-pref-0.patch
+@@ -0,0 +1,11 @@
++--- a/uradvd.c
+++++ b/uradvd.c
++@@ -43,7 +43,7 @@
++ 
++ /* These are in seconds */
++ #define AdvValidLifetime 86400u
++-#define AdvPreferredLifetime 14400u
+++#define AdvPreferredLifetime 0u
++ #define AdvDefaultLifetime 0u
++ #define AdvCurHopLimit 64u
++ #define AdvRDNSSLifetime 1200u

patches/packages/packages/0003-perl-replace-910-miniperl-needs-inc-dot.patch-with-smaller-scope-fix.patch

+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Fri, 25 Apr 2025 02:06:17 +0200
+Subject: perl: replace 910-miniperl-needs-inc-dot.patch with smaller scope fix
+
+The patch was first introduced in commit 4a94479f9652 ("perl: update to
+5.26.1") to fix the target build when the host perl has
+default_inc_excludes_dot enabled. It just added back the `-I`. to every
+call of miniperl; this solution is questionable however, as it adds `.` to
+the beginning of the search path, not as a final fallback like perl did
+before default_inc_excludes_dot (and like miniperl does).
+
+It is also not necessary - only two scripts, write_buildcustomize.pl and
+configpm, expect to be able to include a file from `.` (in both cases a
+file the script just generated). Just fix the two scripts instead.
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/lang/perl/patches/910-fix-default_inc_excludes_dot.patch b/lang/perl/patches/910-fix-default_inc_excludes_dot.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..ab3e6243bda314f137d1c328fbbf0e7f3bb34f36
+--- /dev/null
++++ b/lang/perl/patches/910-fix-default_inc_excludes_dot.patch
+@@ -0,0 +1,22 @@
++--- a/write_buildcustomize.pl
+++++ b/write_buildcustomize.pl
++@@ -3,7 +3,7 @@
++ use strict;
++ 
++ my $osname = $^O;
++-my $file = 'lib/buildcustomize.pl';
+++my $file = './lib/buildcustomize.pl';
++ 
++ if ( @ARGV % 2 ) {
++     my $dir = shift;
++--- a/configpm
+++++ b/configpm
++@@ -129,7 +129,7 @@ if ($Opts{chdir}) {
++ my ($Config_SH, $Config_PM, $Config_heavy, $Config_POD);
++ my $Glossary = 'Porting/Glossary';
++ 
++-$Config_PM = "lib/Config.pm";
+++$Config_PM = "./lib/Config.pm";
++ $Config_POD = "lib/Config.pod";
++ $Config_SH = "config.sh";
++ 
+diff --git a/lang/perl/patches/910-miniperl-needs-inc-dot.patch b/lang/perl/patches/910-miniperl-needs-inc-dot.patch
+deleted file mode 100644
+index 6997f04d575e5bb92e78052cf693ae39bb464a20..0000000000000000000000000000000000000000
+--- a/lang/perl/patches/910-miniperl-needs-inc-dot.patch
++++ /dev/null
+@@ -1,38 +0,0 @@
+---- a/Makefile.SH
+-+++ b/Makefile.SH
+-@@ -346,7 +346,7 @@ OBJ_EXT = $_o
+- # Macros to invoke a copy of miniperl during the build.  Targets which
+- # are built using these macros should depend on \$(MINIPERL_EXE)
+- MINIPERL_EXE = miniperl\$(EXE_EXT)
+--MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE_EXT) -Ilib
+-+MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE_EXT) -Ilib -I.
+- 
+- # Macros to invoke sort the MANIFEST during build
+- MANIFEST_SRT = MANIFEST.srt
+-@@ -1001,7 +1001,7 @@ lib/buildcustomize.pl: $& $(miniperl_obj
+- 	@$(RMS) miniperl.xok
+- 	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
+- 	    $(miniperl_objs) $(libs)
+--	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+-+	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -I. -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+- 	$(MINIPERL) -f write_buildcustomize.pl
+- !NO!SUBS!
+- 		;;
+-@@ -1012,7 +1012,7 @@ lib/buildcustomize.pl: \$& \$(miniperl_d
+- 	@\$(RMS) miniperl.xok
+- 	@\$(RMS) \$(MINIPERL_EXE)
+- 	\$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
+--	\$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+-+	\$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -I. -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+- 	\$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
+- !GROK!THIS!
+- 		else
+-@@ -1021,7 +1021,7 @@ lib/buildcustomize.pl: $& $(miniperl_dep
+- 	@$(RMS) miniperl.xok
+- 	$(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
+- 	    $(miniperl_objs) $(libs)
+--	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+-+	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -I. -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+- 	$(MINIPERL) -f write_buildcustomize.pl
+- !NO!SUBS!
+- 		fi

patches/packages/packages/0004-perl-drop-110-always_use_miniperl.patch.patch

+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Fri, 25 Apr 2025 12:35:23 +0200
+Subject: perl: drop 110-always_use_miniperl.patch
+
+The patch was introduced in commit 4c57844f0f04 ("lang/perl: Add hack to
+make perl always use miniperl during build"), but it is not actually
+necessary. By setting $perl to a non-empty value (using 'perl' as is
+common on desktop distros), the logic works as intended and selects the
+correct perl binary for host and target builds.
+
+As miniperl just symlinks to host perl for target builds, the main
+effect of this change is not unconditionally passing `-Ilib -I.`
+anymore. This seems like a good thing; host libraries should be used
+with host perl by default.
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/lang/perl/files/base.config b/lang/perl/files/base.config
+index 67232b6d83e70505e7e85ad6893a2661f4571f7f..7d8b88b200f589b0efad7b301d26c6f9b77dfb33 100644
+--- a/lang/perl/files/base.config
++++ b/lang/perl/files/base.config
+@@ -864,7 +864,7 @@ package='perl5'
+ pager='/usr/bin/less'
+ passcat='cat /etc/passwd'
+ path_sep=':'
+-perl=''
++perl='perl'
+ perl5=''
+ perl_patchlevel=''
+ perl_static_inline='static __inline__'
+diff --git a/lang/perl/patches/110-always_use_miniperl.patch b/lang/perl/patches/110-always_use_miniperl.patch
+deleted file mode 100644
+index 806a31256b2007ee5f2c36d75261fac0d176cc21..0000000000000000000000000000000000000000
+--- a/lang/perl/patches/110-always_use_miniperl.patch
++++ /dev/null
+@@ -1,27 +0,0 @@
+---- a/Makefile.SH
+-+++ b/Makefile.SH
+-@@ -360,22 +360,11 @@ PERL_EXE_LDFLAGS=$exeldflags
+- 	;;
+- esac
+- 
+--case "$usecrosscompile$perl" in
+--define?*)
+--	$spitshell >>$Makefile <<!GROK!THIS!
+--# Macros to invoke a copy of our fully operational perl during the build.
+--PERL_EXE = perl\$(EXE_EXT)
+--RUN_PERL = \$(LDLIBPTH) \$(RUN) $perl\$(EXE_EXT)
+--!GROK!THIS!
+--	;;
+--*)
+--	$spitshell >>$Makefile <<!GROK!THIS!
+-+$spitshell >>$Makefile <<!GROK!THIS!
+- # Macros to invoke a copy of our fully operational perl during the build.
+- PERL_EXE = perl\$(EXE_EXT)
+--RUN_PERL = \$(LDLIBPTH) \$(RUN) ./perl\$(EXE_EXT) -Ilib -I.
+-+RUN_PERL = \$(LDLIBPTH) \$(RUN) ./miniperl\$(EXE_EXT) -Ilib -I.
+- !GROK!THIS!
+--	;;
+--esac
+- 
+- $spitshell >>$Makefile <<!GROK!THIS!
+- # Macros to run our tests
+diff --git a/lang/perl/patches/900-use-rm-force.patch b/lang/perl/patches/900-use-rm-force.patch
+index 9e44f5402f184445dcf4e9c75d96d2e412e5c4e0..baff506f6427f0b16712c252b0159ad80db20243 100644
+--- a/lang/perl/patches/900-use-rm-force.patch
++++ b/lang/perl/patches/900-use-rm-force.patch
+@@ -8,7 +8,7 @@
+  ranlib = $ranlib
+  ECHO = $echo
+  
+-@@ -791,7 +792,7 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX
++@@ -802,7 +803,7 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX
+  	./generate_uudmap$(HOST_EXE_EXT) $(generated_headers)
+  
+  generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT)
+@@ -17,7 +17,7 @@
+  	$(LNS) $(HOST_GENERATE) generate_uudmap$(HOST_EXE_EXT)
+  
+  !NO!SUBS!
+-@@ -896,26 +897,26 @@ mydtrace.h: $(DTRACE_H)
++@@ -907,26 +908,26 @@ mydtrace.h: $(DTRACE_H)
+  	define)
+  		$spitshell >>$Makefile <<'!NO!SUBS!'
+  $(DTRACE_MINI_O): perldtrace.d $(miniperl_objs_nodt)
+@@ -48,7 +48,7 @@
+  
+  !NO!SUBS!
+  		;;
+-@@ -926,13 +927,13 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
++@@ -937,13 +938,13 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
+  	case "$useshrplib" in
+  	true)
+  		$spitshell >>$Makefile <<'!NO!SUBS!'
+@@ -64,7 +64,7 @@
+  	mv $@ libperl$(OBJ_EXT)
+  	$(AR) qv $(LIBPERL) libperl$(OBJ_EXT)
+  !NO!SUBS!
+-@@ -941,7 +942,7 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
++@@ -952,7 +953,7 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
+  		;;
+  	*)
+  		$spitshell >>$Makefile <<'!NO!SUBS!'
+@@ -73,7 +73,7 @@
+  	$(AR) rc $(LIBPERL) $(perllib_objs) $(DYNALOADER)
+  	@$(ranlib) $(LIBPERL)
+  !NO!SUBS!
+-@@ -975,7 +976,7 @@ $(MINIPERL_EXE): lib/buildcustomize.pl
++@@ -986,7 +987,7 @@ $(MINIPERL_EXE): lib/buildcustomize.pl
+  	amigaos*)
+  		$spitshell >>$Makefile <<'!NO!SUBS!'
+  lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
+@@ -82,7 +82,7 @@
+  	$(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
+  	    $(miniperl_objs) $(libs)
+  #	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+-@@ -997,7 +998,7 @@ NAMESPACEFLAGS = -force_flat_namespace
++@@ -1008,7 +1009,7 @@ NAMESPACEFLAGS = -force_flat_namespace
+  		esac
+  		$spitshell >>$Makefile <<'!NO!SUBS!'
+  lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
+@@ -91,7 +91,7 @@
+  	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
+  	    $(miniperl_objs) $(libs)
+  	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+-@@ -1008,8 +1009,8 @@ lib/buildcustomize.pl: $& $(miniperl_obj
++@@ -1019,8 +1020,8 @@ lib/buildcustomize.pl: $& $(miniperl_obj
+  		if test "X$hostperl" != X; then
+  			$spitshell >>$Makefile <<!GROK!THIS!
+  lib/buildcustomize.pl: \$& \$(miniperl_dep) write_buildcustomize.pl
+@@ -102,7 +102,7 @@
+  	\$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
+  	\$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+  	\$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
+-@@ -1017,7 +1018,7 @@ lib/buildcustomize.pl: \$& \$(miniperl_d
++@@ -1028,7 +1029,7 @@ lib/buildcustomize.pl: \$& \$(miniperl_d
+  		else
+  			$spitshell >>$Makefile <<'!NO!SUBS!'
+  lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl
+@@ -111,7 +111,7 @@
+  	$(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
+  	    $(miniperl_objs) $(libs)
+  	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+-@@ -1030,7 +1031,7 @@ lib/buildcustomize.pl: $& $(miniperl_dep
++@@ -1041,7 +1042,7 @@ lib/buildcustomize.pl: $& $(miniperl_dep
+  	$spitshell >>$Makefile <<'!NO!SUBS!'
+  
+  $(PERL_EXE): $& $(perlmain_dep) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) write_buildcustomize.pl
+@@ -120,7 +120,7 @@
+  !NO!SUBS!
+  
+          case "$osname" in
+-@@ -1130,8 +1131,8 @@ pod/perl5400delta.pod: pod/perldelta.pod
++@@ -1141,8 +1142,8 @@ pod/perl5400delta.pod: pod/perldelta.pod
+  	$(LNS) perldelta.pod pod/perl5400delta.pod
+  
+  extra.pods: $(MINIPERL_EXE)
+@@ -131,7 +131,7 @@
+  	-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
+  	    nx=`echo $$x | sed -e "s/README\.//"`; \
+  	    $(LNS) ../$$x "pod/perl"$$nx".pod" ; \
+-@@ -1330,11 +1331,11 @@ realclean:	_realcleaner _mopup
++@@ -1341,11 +1342,11 @@ realclean:	_realcleaner _mopup
+  	@echo "Note that '$(MAKE) realclean' does not delete config.sh or Policy.sh"
+  
+  _clobber:
+@@ -148,7 +148,7 @@
+  
+  clobber:	_realcleaner _mopup _clobber
+  
+-@@ -1342,24 +1343,24 @@ distclean:	clobber
++@@ -1353,24 +1354,24 @@ distclean:	clobber
+  
+  # Like distclean but also removes emacs backups and *.orig.
+  veryclean:	_verycleaner _mopup _clobber
+@@ -184,7 +184,7 @@
+  	-cd pod; $(LDLIBPTH) $(MAKE) $(CLEAN)
+  	-cd utils; $(LDLIBPTH) $(MAKE) $(CLEAN)
+  	-@if test -f $(MINIPERL_EXE) ; then \
+-@@ -1369,8 +1370,8 @@ _cleaner1:
++@@ -1380,8 +1381,8 @@ _cleaner1:
+  	else \
+  	sh $(CLEAN).sh ; \
+  	fi
+@@ -195,7 +195,7 @@
+  
+  # Dear POSIX, thanks for making the default to xargs to be
+  # run once if nothing is passed in. It is such a great help.
+-@@ -1385,24 +1386,24 @@ _cleaner1:
++@@ -1396,24 +1397,24 @@ _cleaner1:
+  # Add new rules before that line - the next line (rm -f so_locations ...) is
+  # used as a placeholder by a regen script.
+  _cleaner2:
+@@ -237,7 +237,7 @@
+  	-rmdir lib/version lib/threads lib/inc/ExtUtils lib/inc lib/encoding
+  	-rmdir lib/autodie/exception lib/autodie/Scope lib/autodie lib/XS
+  	-rmdir lib/Win32API lib/VMS lib/Unicode/Collate/Locale
+-@@ -1459,11 +1460,11 @@ _realcleaner:
++@@ -1470,11 +1471,11 @@ _realcleaner:
+  _verycleaner:
+  	@$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=veryclean
+  	@$(LDLIBPTH) $(MAKE) _cleaner2
+@@ -251,7 +251,7 @@
+  	lint $(lintflags) -DPERL_CORE -D_REENTRANT -DDEBUGGING -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(c)
+  
+  cscopeflags = -Rb  # Recursive, build-only.
+-@@ -1524,7 +1525,7 @@ case "$targethost" in
++@@ -1535,7 +1536,7 @@ case "$targethost" in
+  '') $spitshell >>$Makefile <<'!NO!SUBS!'
+  test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \
+  	$(dynamic_ext) $(TEST_PERL_DLL) runtests $(generated_pods) common_build
+@@ -260,7 +260,7 @@
+  
+  !NO!SUBS!
+  ;;
+-@@ -1574,7 +1575,7 @@ test_prep test-prep: test_prep_pre \$(MI
++@@ -1585,7 +1586,7 @@ test_prep test-prep: test_prep_pre \$(MI
+  	$to config.sh
+  # --- For lib/diagnostics.t with -Duseshrplib
+  	$to \$(PERL_EXE)
+@@ -269,7 +269,7 @@
+  	$to t/\$(PERL_EXE)
+  
+  !GROK!THIS!
+-@@ -1592,7 +1593,7 @@ else
++@@ -1603,7 +1604,7 @@ else
+  $spitshell >>$Makefile <<'!NO!SUBS!'
+  test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
+  	$(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
+@@ -278,7 +278,7 @@
+  !NO!SUBS!
+  fi
+  
+-@@ -1648,7 +1649,7 @@ minitest_prep: $(MINIPERL_EXE)
++@@ -1659,7 +1660,7 @@ minitest_prep: $(MINIPERL_EXE)
+  	@echo "You may see some irrelevant test failures if you have been unable"
+  	@echo "to build lib/Config.pm, or the Unicode data files."
+  	@echo " "
+diff --git a/lang/perl/patches/920-Revert-perl-127606-adjust-dependency-paths-on-instal.patch b/lang/perl/patches/920-Revert-perl-127606-adjust-dependency-paths-on-instal.patch
+index e9e5688e475e810f45acbda5cd579c65e484b8b7..6436a8ea027f46a8ce1c41b13323b625cc51eb4d 100644
+--- a/lang/perl/patches/920-Revert-perl-127606-adjust-dependency-paths-on-instal.patch
++++ b/lang/perl/patches/920-Revert-perl-127606-adjust-dependency-paths-on-instal.patch
+@@ -42,10 +42,10 @@ Signed-off-by: Georgi Valkov <gvalkov@gmail.com>
+ -	;;
+ -esac
+ -
+- $spitshell >>$Makefile <<!GROK!THIS!
+- # Macros to invoke a copy of our fully operational perl during the build.
+- PERL_EXE = perl\$(EXE_EXT)
+-@@ -1045,20 +1029,6 @@ $(PERL_EXE): $& $(perlmain_dep) $(LIBPER
++ case "$usecrosscompile$perl" in
++ define?*)
++ 	$spitshell >>$Makefile <<!GROK!THIS!
++@@ -1056,20 +1040,6 @@ $(PERL_EXE): $& $(perlmain_dep) $(LIBPER
+  	$(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(LLIBPERL) $(static_ext) `cat ext.libs` $(libs)
+  !NO!SUBS!
+          ;;

patches/packages/packages/0005-perl-fix-parallel-build-race-condition-in-target-build.patch

+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Sat, 26 Apr 2025 22:37:16 +0200
+Subject: perl: fix parallel build race condition in target build
+
+We have received reports of builds of perl occasionally failing when
+building with many parallel jobs, with a log like the following:
+
+    LD_LIBRARY_PATH=[...]/perl/perl-5.40.0 ./miniperl -Ilib make_ext.pl \
+        dist/constant/pm_to_blib  MAKE="make" LIBPERL_A=libperl.so
+    File/Path.pm did not return a true value at [...]/hostpkg/usr/lib/perl5/5.40.0/ExtUtils/MakeMaker.pm line 13.
+    BEGIN failed--compilation aborted at [...]/hostpkg/usr/lib/perl5/5.40.0/ExtUtils/MakeMaker.pm line 13.
+    Compilation failed in require at Makefile.PL line 3.
+    BEGIN failed--compilation aborted at Makefile.PL line 3.
+    Unsuccessful Makefile.PL(dist/constant): code=65280 at make_ext.pl line 532.
+
+The failing extension (dist/constant in the above log) would differ
+between runs.
+
+The cause of the issue is the `-Ilib` in the command line of miniperl.
+In the host build, `./miniperl -I lib` will use the following include
+path:
+
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/AutoLoader/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/dist/Carp/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/dist/PathTools
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/dist/PathTools/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/ExtUtils-Install/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/ExtUtils-MakeMaker/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/ExtUtils-Manifest/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/File-Path/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/ext/re
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/dist/Term-ReadLine/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/dist/Exporter/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/ext/File-Find/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/Text-Tabs/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/dist/constant/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/version/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/Getopt-Long/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/Text-ParseWords/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/ExtUtils-PL2Bat/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/lib
+    .
+
+Various dependencies of the extension build scripts (Makefile.PL) -
+including File-Path, which failed to be loaded in the error log - are
+included in the path by buildcustomize.pl, as these extensions are only
+installed to `lib` as the build proceeds.
+
+However, in a target build, miniperl is just a symlink to the previously
+built host perl. As the host perl does not implicitly load
+`buildcustomize.pl`, we get the following include path for
+`./miniperl -Ilib`:
+
+    lib
+    [..]/staging_dir/hostpkg/usr/lib/perl5/site_perl/5.40.0/x86_64-linux
+    [..]/staging_dir/hostpkg/usr/lib/perl5/site_perl/5.40.0
+    [..]/staging_dir/hostpkg/usr/lib/perl5/5.40.0/x86_64-linux
+    [..]/staging_dir/hostpkg/usr/lib/perl5/5.40.0
+
+The host perl's install location is used as the default include path
+which provides File-Path etc. for the target build; however, as more
+and more libraries get installed into `lib` during the extension build,
+they may get loaded from there instead, as `lib` is at the beginning of
+the include path. When multiple extensions are built in parallel, a
+Makefile.PL may attempt to load File/Path from `lib` after the file has
+been created, but before its contents have been written fully, resulting
+in the build to fail.
+
+In fact, we should not load anything from `lib` during the target build,
+as it is the staging directory for the target, including native
+extensions built for the target architecture - with one exception: The
+build scripts expect to find target information in the `Config` module,
+so simply removing `lib` from the include path completely would break
+the build.
+
+Solve the issue by creating an alternative lib directory `lib_build`,
+symlinking `Config.pm` and its dependencies in it, and replacing the
+`-Ilib` argument with `-Ilib_build` using a wrapper script around the
+host perl executable. This is similar to the approach seen in perl's own
+obsolete/broken cross compile scripts (`Cross/Makefile`).
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/lang/perl/Makefile b/lang/perl/Makefile
+index 6a6dd5ea86798e7e95e3657a94cca829dbd0924b..6ad27818e17c211abc1530eb0d1b1e7c1238bf28 100644
+--- a/lang/perl/Makefile
++++ b/lang/perl/Makefile
+@@ -92,6 +92,21 @@ endef
+ 
+ # Target perl
+ define Build/Configure
++	# We don't want to pass -Ilib to host perl in the target build (as lib
++	# contains the target libraries, and files may currently be written
++	# while being imported in parallel builds). We do however need the
++	# target versions of the Config modules at the beginning of the include
++	# path for the build scripts' use.
++	#
++	# Create an alternative lib_build directory that will be added to the
++	# include path instead of lib (using hostperl-wrapper), containing only
++	# the config modules.
++	$(INSTALL_DIR) $(PKG_BUILD_DIR)/lib_build
++	ln -sf ../lib/Config.pm ../lib/Config_heavy.pl ../lib/Config_git.pl $(PKG_BUILD_DIR)/lib_build/
++
++	install -m0755 files/hostperl-wrapper $(PKG_BUILD_DIR)/hostperl-wrapper
++	sed -i "s'@HOST_PERL@'$(HOST_PERL_PREFIX)/bin/perl'g" $(PKG_BUILD_DIR)/hostperl-wrapper
++
+ 	$(PERL_CMD) files/perlconfig.pl -Dowrt:target_cc='$(TARGET_CC)' \
+ 	                                -Dowrt:gccversion=$(CONFIG_GCC_VERSION) \
+ 	                                -Dowrt:target_cross='$(TARGET_CROSS)' \
+diff --git a/lang/perl/files/base.config b/lang/perl/files/base.config
+index 7d8b88b200f589b0efad7b301d26c6f9b77dfb33..1cadfc10ac20c3b2bb05bed3c2cc8e946ba24eef 100644
+--- a/lang/perl/files/base.config
++++ b/lang/perl/files/base.config
+@@ -650,7 +650,7 @@ hint='recommended'
+ hostcat='cat /etc/hosts'
+ hostgenerate="$owrt:host_perl_prefix/bin/generate_uudmap"
+ hostosname=''
+-hostperl="$owrt:host_perl_prefix/bin/perl"
++hostperl="./hostperl-wrapper"
+ html1dir=' '
+ html1direxp=''
+ html3dir=' '
+diff --git a/lang/perl/files/hostperl-wrapper b/lang/perl/files/hostperl-wrapper
+new file mode 100644
+index 0000000000000000000000000000000000000000..e31ef1cf8fe37a7a90ee9dd7cc60d3ca947e7600
+--- /dev/null
++++ b/lang/perl/files/hostperl-wrapper
+@@ -0,0 +1,14 @@
++#!@HOST_PERL@
++
++foreach (@ARGV) {
++	# Stop parsing options if we encounter a non-option argument or --
++	last if $_ eq '--' || $_ !~ m/^-/;
++
++	# Modify first option of the form -Ilib, -I../lib, ... to refer to lib_build instead
++	if ($_ =~ m@-I(.*/)?lib@) {
++		$_ .= '_build';
++		last;
++	}
++}
++
++exec '@HOST_PERL@', @ARGV

patches/packages/routing/0002-batman-adv-Introduce-no-noflood-mark.patch

+From: Linus Lüssing <linus.luessing@c0d3.blue>
+Date: Sun, 10 Nov 2024 19:34:26 +0100
+Subject: batman-adv: Introduce no noflood mark
+
+This mark prevents a multicast packet being flooded through the whole
+mesh. The advantage of marking certain multicast packets via e.g.
+ebtables instead of dropping is then the following:
+
+This allows an administrator to let specific multicast packets pass as
+long as they are forwarded to a limited number of nodes only and are
+therefore creating no burdon to unrelated nodes.
+
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+
+diff --git a/batman-adv/patches/2002-batman-adv-Introduce-no-noflood-mark.patch b/batman-adv/patches/2002-batman-adv-Introduce-no-noflood-mark.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..6058bff5bb4d07c78a82f59b47213a52b04d6a1e
+--- /dev/null
++++ b/batman-adv/patches/2002-batman-adv-Introduce-no-noflood-mark.patch
+@@ -0,0 +1,137 @@
++From: Linus Lüssing <linus.luessing@c0d3.blue>
++Date: Sat, 31 Mar 2018 03:36:19 +0200
++Subject: batman-adv: Introduce no noflood mark
++
++This mark prevents a multicast packet being flooded through the whole
++mesh. The advantage of marking certain multicast packets via e.g.
++ebtables instead of dropping is then the following:
++
++This allows an administrator to let specific multicast packets pass as
++long as they are forwarded to a limited number of nodes only and are
++therefore creating no burdon to unrelated nodes.
++
++Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
++
++--- a/include/uapi/linux/batman_adv.h
+++++ b/include/uapi/linux/batman_adv.h
++@@ -481,6 +481,18 @@ enum batadv_nl_attrs {
++ 	 */
++ 	BATADV_ATTR_MULTICAST_FANOUT,
++ 
+++	/**
+++	 * @BATADV_ATTR_NOFLOOD_MARK: the noflood mark which allows to tag
+++	 *  frames which should never be broadcast flooded through the mesh.
+++	 */
+++	BATADV_ATTR_NOFLOOD_MARK,
+++
+++	/**
+++	 * @BATADV_ATTR_NOFLOOD_MASK: the noflood (bit)mask which allows to tag
+++	 *  frames which should never be broadcast flooded through the mesh.
+++	 */
+++	BATADV_ATTR_NOFLOOD_MASK,
+++
++ 	/* add attributes above here, update the policy in netlink.c */
++ 
++ 	/**
++--- a/net/batman-adv/netlink.c
+++++ b/net/batman-adv/netlink.c
++@@ -133,6 +133,8 @@ static const struct nla_policy batadv_ne
++ 	[BATADV_ATTR_AP_ISOLATION_ENABLED]	= { .type = NLA_U8 },
++ 	[BATADV_ATTR_ISOLATION_MARK]		= { .type = NLA_U32 },
++ 	[BATADV_ATTR_ISOLATION_MASK]		= { .type = NLA_U32 },
+++	[BATADV_ATTR_NOFLOOD_MARK]		= { .type = NLA_U32 },
+++	[BATADV_ATTR_NOFLOOD_MASK]		= { .type = NLA_U32 },
++ 	[BATADV_ATTR_BONDING_ENABLED]		= { .type = NLA_U8 },
++ 	[BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED]	= { .type = NLA_U8 },
++ 	[BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED]	= { .type = NLA_U8 },
++@@ -285,6 +287,14 @@ static int batadv_netlink_mesh_fill(stru
++ 			bat_priv->isolation_mark_mask))
++ 		goto nla_put_failure;
++ 
+++	if (nla_put_u32(msg, BATADV_ATTR_NOFLOOD_MARK,
+++			bat_priv->noflood_mark))
+++		goto nla_put_failure;
+++
+++	if (nla_put_u32(msg, BATADV_ATTR_NOFLOOD_MASK,
+++			bat_priv->noflood_mark_mask))
+++		goto nla_put_failure;
+++
++ 	if (nla_put_u8(msg, BATADV_ATTR_BONDING_ENABLED,
++ 		       !!atomic_read(&bat_priv->bonding)))
++ 		goto nla_put_failure;
++@@ -463,6 +473,18 @@ static int batadv_netlink_set_mesh(struc
++ 		bat_priv->isolation_mark_mask = nla_get_u32(attr);
++ 	}
++ 
+++	if (info->attrs[BATADV_ATTR_NOFLOOD_MARK]) {
+++		attr = info->attrs[BATADV_ATTR_NOFLOOD_MARK];
+++
+++		bat_priv->noflood_mark = nla_get_u32(attr);
+++	}
+++
+++	if (info->attrs[BATADV_ATTR_NOFLOOD_MASK]) {
+++		attr = info->attrs[BATADV_ATTR_NOFLOOD_MASK];
+++
+++		bat_priv->noflood_mark_mask = nla_get_u32(attr);
+++	}
+++
++ 	if (info->attrs[BATADV_ATTR_BONDING_ENABLED]) {
++ 		attr = info->attrs[BATADV_ATTR_BONDING_ENABLED];
++ 
++--- a/net/batman-adv/soft-interface.c
+++++ b/net/batman-adv/soft-interface.c
++@@ -177,6 +177,23 @@ static void batadv_interface_set_rx_mode
++ {
++ }
++ 
+++/**
+++ * batadv_send_skb_has_noflood_mark() - check if packet has a noflood mark
+++ * @bat_priv: the bat priv with all the soft interface information
+++ * @skb: the packet to check
+++ *
+++ * Return: True if the skb's mark matches a configured noflood mark and
+++ * noflood mark mask. False otherwise.
+++ */
+++static bool
+++batadv_skb_has_noflood_mark(struct batadv_priv *bat_priv, struct sk_buff *skb)
+++{
+++	u32 match_mark = skb->mark & bat_priv->noflood_mark_mask;
+++
+++	return bat_priv->noflood_mark_mask &&
+++	       match_mark == bat_priv->noflood_mark;
+++}
+++
++ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,
++ 				       struct net_device *soft_iface)
++ {
++@@ -333,6 +350,9 @@ send:
++ 		if (batadv_dat_snoop_outgoing_arp_request(bat_priv, skb))
++ 			brd_delay = msecs_to_jiffies(ARP_REQ_DELAY);
++ 
+++		if (batadv_skb_has_noflood_mark(bat_priv, skb))
+++			goto dropped;
+++
++ 		if (batadv_skb_head_push(skb, sizeof(*bcast_packet)) < 0)
++ 			goto dropped;
++ 
++--- a/net/batman-adv/types.h
+++++ b/net/batman-adv/types.h
++@@ -1711,6 +1711,18 @@ struct batadv_priv {
++ 	 */
++ 	u32 isolation_mark_mask;
++ 
+++	/**
+++	 * @noflood_mark: the skb->mark value used to allow directed targeting
+++	 *  only
+++	 */
+++	u32 noflood_mark;
+++
+++	/**
+++	 * @noflood_mark_mask: bitmask identifying the bits in skb->mark to be
+++	 *  used for the noflood mark
+++	 */
+++	u32 noflood_mark_mask;
+++
++ 	/** @bcast_seqno: last sent broadcast packet sequence number */
++ 	atomic_t bcast_seqno;
++ 

patches/packages/routing/0003-batctl-Add-noflood_mark-command.patch

+From: Linus Lüssing <linus.luessing@c0d3.blue>
+Date: Sun, 10 Nov 2024 19:35:52 +0100
+Subject: batctl: Add noflood_mark command
+
+Adds support for the new 'noflood_mark' setting in batman-adv.
+
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+
+diff --git a/batctl/patches/2002-batctl-Add-noflood_mark-command.patch b/batctl/patches/2002-batctl-Add-noflood_mark-command.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..d4498603785a21a71951a6195cd96661be44d685
+--- /dev/null
++++ b/batctl/patches/2002-batctl-Add-noflood_mark-command.patch
+@@ -0,0 +1,217 @@
++From 12884631753aa24d9e36c5d65950320ecab61384 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
++Date: Fri, 26 Apr 2019 19:27:38 +0200
++Subject: [PATCH] batctl: Add noflood_mark command
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
++
++Adds support for the new 'noflood_mark' setting in batman-adv.
++
++Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
++---
++ Makefile       |   1 +
++ README.rst     |  15 ++++++
++ batman_adv.h   |  12 +++++
++ noflood_mark.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++
++ 4 files changed, 168 insertions(+)
++ create mode 100644 noflood_mark.c
++
++--- a/Makefile
+++++ b/Makefile
++@@ -69,6 +69,7 @@ $(eval $(call add_command,multicast_mode
++ $(eval $(call add_command,neighbors,y))
++ $(eval $(call add_command,neighbors_json,y))
++ $(eval $(call add_command,network_coding,y))
+++$(eval $(call add_command,noflood_mark,y))
++ $(eval $(call add_command,orig_interval,y))
++ $(eval $(call add_command,originators,y))
++ $(eval $(call add_command,originators_json,y))
++--- a/README.rst
+++++ b/README.rst
++@@ -430,6 +430,21 @@ Example::
++ 
++ 
++ 
+++batctl noflood_mark
+++=======================
+++
+++display or modify noflood_mark setting
+++
+++Usage::
+++
+++  batctl noflood_mark|nf $value[/0x$mask]
+++
+++* Example 1: ``batctl nf 0x00000001/0xffffffff``
+++* Example 2: ``batctl nf 0x00040000/0xffff0000``
+++* Example 3: ``batctl nf 16``
+++* Example 4: ``batctl nf 0x0f``
+++
+++
++ batctl translocal
++ -----------------
++ 
++--- a/batman_adv.h
+++++ b/batman_adv.h
++@@ -481,6 +481,18 @@ enum batadv_nl_attrs {
++ 	 */
++ 	BATADV_ATTR_MULTICAST_FANOUT,
++ 
+++	/**
+++	 * @BATADV_ATTR_NOFLOOD_MARK: the noflood mark which allows to tag
+++	 *  frames which should never be broadcast flooded through the mesh.
+++	 */
+++	BATADV_ATTR_NOFLOOD_MARK,
+++
+++	/**
+++	 * @BATADV_ATTR_NOFLOOD_MASK: the noflood (bit)mask which allows to tag
+++	 *  frames which should never be broadcast flooded through the mesh.
+++	 */
+++	BATADV_ATTR_NOFLOOD_MASK,
+++
++ 	/* add attributes above here, update the policy in netlink.c */
++ 
++ 	/**
++--- /dev/null
+++++ b/noflood_mark.c
++@@ -0,0 +1,140 @@
+++// SPDX-License-Identifier: GPL-2.0
+++/* Copyright (C) 2009-2019  B.A.T.M.A.N. contributors:
+++ *
+++ * Antonio Quartulli <a@unstable.cc>
+++ * Linus Lüssing <linus.luessing@c0d3.blue>
+++ *
+++ * License-Filename: LICENSES/preferred/GPL-2.0
+++ */
+++
+++#include <errno.h>
+++#include <stddef.h>
+++#include <stdint.h>
+++#include <string.h>
+++
+++#include "main.h"
+++#include "sys.h"
+++
+++static struct noflood_mark_data {
+++	uint32_t noflood_mark;
+++	uint32_t noflood_mask;
+++} noflood_mark;
+++
+++static int parse_noflood_mark(struct state *state, int argc, char *argv[])
+++{
+++	struct settings_data *settings = state->cmd->arg;
+++	struct noflood_mark_data *data = settings->data;
+++	char *mask_ptr;
+++	char buff[256];
+++	uint32_t mark;
+++	uint32_t mask;
+++	char *endptr;
+++
+++	if (argc != 2) {
+++		fprintf(stderr, "Error - incorrect number of arguments (expected 1)\n");
+++		return -EINVAL;
+++	}
+++
+++	strncpy(buff, argv[1], sizeof(buff));
+++	buff[sizeof(buff) - 1] = '\0';
+++
+++	/* parse the mask if it has been specified, otherwise assume the mask is
+++	 * the biggest possible
+++	 */
+++	mask = 0xFFFFFFFF;
+++	mask_ptr = strchr(buff, '/');
+++	if (mask_ptr) {
+++		*mask_ptr = '\0';
+++		mask_ptr++;
+++
+++		/* the mask must be entered in hex base as it is going to be a
+++		 * bitmask and not a prefix length
+++		 */
+++		mask = strtoul(mask_ptr, &endptr, 16);
+++		if (!endptr || *endptr != '\0')
+++			goto inval_format;
+++	}
+++
+++	/* the mark can be entered in any base */
+++	mark = strtoul(buff, &endptr, 0);
+++	if (!endptr || *endptr != '\0')
+++		goto inval_format;
+++
+++	data->noflood_mask = mask;
+++	/* erase bits not covered by the mask */
+++	data->noflood_mark = mark & mask;
+++
+++	return 0;
+++
+++inval_format:
+++	fprintf(stderr, "Error - incorrect number of arguments (expected 1)\n");
+++	fprintf(stderr, "The following formats for mark(/mask) are allowed:\n");
+++	fprintf(stderr, " * 0x12345678\n");
+++	fprintf(stderr, " * 0x12345678/0xabcdef09\n");
+++	return -EINVAL;
+++}
+++
+++static int print_noflood_mark(struct nl_msg *msg, void *arg)
+++{
+++	struct nlattr *attrs[BATADV_ATTR_MAX + 1];
+++	struct nlmsghdr *nlh = nlmsg_hdr(msg);
+++	struct genlmsghdr *ghdr;
+++	int *result = arg;
+++
+++	if (!genlmsg_valid_hdr(nlh, 0))
+++		return NL_OK;
+++
+++	ghdr = nlmsg_data(nlh);
+++
+++	if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0),
+++		      genlmsg_len(ghdr), batadv_netlink_policy)) {
+++		return NL_OK;
+++	}
+++
+++	if (!attrs[BATADV_ATTR_NOFLOOD_MARK] ||
+++	    !attrs[BATADV_ATTR_NOFLOOD_MASK])
+++		return NL_OK;
+++
+++	printf("0x%08x/0x%08x\n",
+++	       nla_get_u32(attrs[BATADV_ATTR_NOFLOOD_MARK]),
+++	       nla_get_u32(attrs[BATADV_ATTR_NOFLOOD_MASK]));
+++
+++	*result = 0;
+++	return NL_STOP;
+++}
+++
+++static int get_noflood_mark(struct state *state)
+++{
+++	return sys_simple_nlquery(state, BATADV_CMD_GET_MESH,
+++				  NULL, print_noflood_mark);
+++}
+++
+++static int set_attrs_noflood_mark(struct nl_msg *msg, void *arg)
+++{
+++	struct state *state = arg;
+++	struct settings_data *settings = state->cmd->arg;
+++	struct noflood_mark_data *data = settings->data;
+++
+++	nla_put_u32(msg, BATADV_ATTR_NOFLOOD_MARK, data->noflood_mark);
+++	nla_put_u32(msg, BATADV_ATTR_NOFLOOD_MASK, data->noflood_mask);
+++
+++	return 0;
+++}
+++
+++static int set_noflood_mark(struct state *state)
+++{
+++	return sys_simple_nlquery(state, BATADV_CMD_SET_MESH,
+++				  set_attrs_noflood_mark, NULL);
+++}
+++
+++static struct settings_data batctl_settings_noflood_mark = {
+++	.data = &noflood_mark,
+++	.parse = parse_noflood_mark,
+++	.netlink_get = get_noflood_mark,
+++	.netlink_set = set_noflood_mark,
+++};
+++
+++COMMAND_NAMED(SUBCOMMAND, noflood_mark, "nf", handle_sys_setting,
+++	      COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK,
+++	      &batctl_settings_noflood_mark,
+++	      "[mark]            \tdisplay or modify noflood_mark setting");

scripts/basic_openwrt_config.sh

+#!/usr/bin/env bash
+
+set -euo pipefail
+
+echo "CONFIG_DEVEL=y"
+if [ "$GLUON_AUTOREMOVE" != "0" ]; then
+	echo "CONFIG_AUTOREMOVE=y"
+else
+	echo "# CONFIG_AUTOREMOVE is not set"
+fi

scripts/clean_output.lua

+local lib = dofile('scripts/target_lib.lua')
+local env = lib.env
+
+
+local subtarget = env.SUBTARGET
+if subtarget == '' then
+	subtarget = 'generic'
+end
+
+local bindir = env.BOARD .. '/' .. subtarget
+
+
+lib.exec({'rm', '-f', 'openwrt/bin/targets/'..bindir..'/\0'}, true, '2>/dev/null')
+
+-- Full builds will output the "packages" directory, so clean up first
+if (env.GLUON_DEVICES or '') == '' then
+	lib.exec {'rm', '-rf', 'openwrt/bin/targets/'..bindir..'/packages'}
+end

scripts/clean_output.sh

-#!/usr/bin/env bash
-
-set -e
-
-[ "$OPENWRT_TARGET" ] || exit 1
-
-
-. scripts/common.inc.sh
-
-
-if [ "$(expr match "$OPENWRT_TARGET" '.*-.*')" -gt 0 ]; then
-	OPENWRT_BINDIR="${OPENWRT_TARGET//-/\/}"
-else
-	OPENWRT_BINDIR="${OPENWRT_TARGET}/generic"
-fi
-
-rm -f "openwrt/bin/targets/${OPENWRT_BINDIR}"/* 2>/dev/null || true
-
-# Full builds will output the "packages" directory, so clean up first
-[ "$DEVICES" ] || rm -rf "openwrt/bin/targets/${OPENWRT_BINDIR}/packages"

scripts/common.inc.sh

-config() {
-	:
-}
-
-try_config() {
-	:
-}
-
-device() {
-	:
-}
-
-factory_image() {
-	:
-}
-
-sysupgrade_image() {
-	:
-}
-
-alias() {
-	:
-}
-
-manifest_alias() {
-	:
-}
-
-packages() {
-	:
-}
-
-factory() {
-	:
-}
-
-sysupgrade() {
-	:
-}
-
-extra_image() {
-	:
-}
-
-no_opkg() {
-	:
-}
-
-
-unknown_devices="$DEVICES"
-
-want_device() {
-	[ "$DEVICES" ] || return 0
-
-	local new_devices=''
-
-	for device in $unknown_devices; do
-		if [ "$device" != "$1" ]; then
-			new_devices="${new_devices:+${new_devices} }$device"
-		fi
-	done
-	unknown_devices=$new_devices
-
-	for device in $DEVICES; do
-		if [ "$device" = "$1" ]; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-check_devices() {
-	if [ "$unknown_devices" ]; then
-		echo "Error: unknown devices given: ${unknown_devices}" >&2
-		exit 1
-	fi
-}

scripts/container.sh

+#!/usr/bin/env bash
+# shellcheck enable=check-unassigned-uppercase
+
+set -euo pipefail
+
+# move into base directory, in case this script is not executed via `make container`
+cd "$(dirname "$0")/.."
+
+# normalize branch name to reflect a valid image name
+BRANCH=$(git branch --show-current 2>/dev/null | sed 's/[^a-z0-9-]/_/ig')
+TAG="gluon:${BRANCH:-latest}"
+
+if [ "$(command -v podman)" ]
+then
+	podman build -t "${TAG}" contrib/docker
+	podman run -it --rm -u "$(id -u):$(id -g)" --userns=keep-id --volume="$(pwd):/gluon:z" "${TAG}"
+elif [ "$(command -v docker)" ]
+then
+	docker build -t "${TAG}" contrib/docker
+	docker run -it --rm -u "$(id -u):$(id -g)" --volume="$(pwd):/gluon" -e HOME=/gluon "${TAG}"
+else
+	echo "Please install either podman or docker. Exiting" >&2
+	exit 1
+fi

scripts/copy_output.lua

+local lib = dofile('scripts/target_lib.lua')
+local env = lib.env
+
+local target = env.GLUON_TARGET
+
+assert(target)
+assert(env.GLUON_IMAGEDIR)
+assert(env.GLUON_PACKAGEDIR)
+
+
+local openwrt_target
+local subtarget = env.SUBTARGET
+if subtarget ~= '' then
+	openwrt_target = env.BOARD .. '-' .. subtarget
+else
+	openwrt_target = env.BOARD
+	subtarget = 'generic'
+end
+
+local bindir = env.BOARD .. '/' .. subtarget
+
+
+local function mkdir(dir)
+	lib.exec {'mkdir', '-p', dir}
+end
+
+mkdir(env.GLUON_IMAGEDIR..'/factory')
+mkdir(env.GLUON_IMAGEDIR..'/sysupgrade')
+mkdir(env.GLUON_IMAGEDIR..'/other')
+mkdir(env.GLUON_DEBUGDIR)
+mkdir(env.GLUON_METADIR..'/openwrt-profiles')
+
+
+lib.include(target)
+
+
+local function image_source(image)
+	return string.format(
+		'openwrt/bin/targets/%s/openwrt-%s-%s%s%s',
+		bindir, openwrt_target, image.name, image.in_suffix, image.extension)
+end
+
+local function clean(image, name)
+	local dir, file = image:dest_name(name, '\0', '\0')
+	lib.exec {'rm', '-f', dir..'/'..file}
+end
+
+for _, images in pairs(lib.images) do
+	for _, image in ipairs(images) do
+		clean(image, image.image)
+
+		local destdir, destname = image:dest_name(image.image)
+		local source = image_source(image)
+
+		lib.exec {'cp', source, destdir..'/'..destname}
+
+		for _, alias in ipairs(image.aliases) do
+			clean(image, alias)
+
+			local _, aliasname = image:dest_name(alias)
+			lib.exec {'ln', '-s', destname, destdir..'/'..aliasname}
+		end
+	end
+
+	for _, image in ipairs(images) do
+		local source = image_source(image)
+		lib.exec {'rm', '-f', source}
+	end
+end
+
+-- copy kernel image with debug symbols
+local kernel_debug_glob = string.format('%s/gluon-\0-%s-kernel-debug.tar.zst',
+	env.GLUON_DEBUGDIR,
+	target)
+lib.exec {'rm', '-f', kernel_debug_glob}
+local kernel_debug_source = string.format('openwrt/bin/targets/%s/kernel-debug.tar.zst',
+	bindir)
+local kernel_debug_dest = string.format('%s/gluon-%s-%s-%s-kernel-debug.tar.zst',
+	env.GLUON_DEBUGDIR,
+	lib.site_code,
+	env.GLUON_RELEASE,
+	target)
+lib.exec {'cp', kernel_debug_source, kernel_debug_dest}
+
+-- copy OpenWrt profile JSON
+local profile_json_source = string.format('openwrt/bin/targets/%s/profiles.json',
+	bindir)
+local profile_json_dest = string.format('%s/openwrt-profiles/%s.json',
+	env.GLUON_METADIR,
+	target)
+lib.exec {'cp', profile_json_source, profile_json_dest}
+
+-- Copy opkg repo
+if (env.GLUON_DEVICES or '') == '' then
+	local package_prefix = string.format('gluon-%s-%s', lib.site_code, env.GLUON_RELEASE)
+	local function dest_dir(prefix)
+		return env.GLUON_PACKAGEDIR..'/'..prefix..'/'..bindir
+	end
+
+	lib.exec {'rm', '-f', dest_dir('\0')..'/\0'}
+	lib.exec({'rmdir', '-p', dest_dir('\0')}, true, '2>/dev/null')
+	mkdir(dest_dir(package_prefix))
+	lib.exec {'rm', '-rf', 'openwrt/bin/targets/'..bindir..'/packages/tmp'}
+	lib.exec {'cp', 'openwrt/bin/targets/'..bindir..'/packages/\0', dest_dir(package_prefix)}
+end