Merge pull request #975 from ecsv/batadv-2023.1

 batman-adv: update packages to version 2023.1

9 files changed, 21 insertions, 122 deletions

diff --git a/alfred/Makefile b/alfred/Makefile
index f163908..af765ec 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alfred
-PKG_VERSION:=2023.0
+PKG_VERSION:=2023.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-PKG_HASH:=c5ecadce50e8228a912b4894567ad45d6ff1d2ba3991c978456e4bef9b7dbad1
+PKG_HASH:=438048248f373757d3a8bde7cbc6db6685f4d0105d130da2f5a54f29090c6974
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
 PKG_LICENSE:=GPL-2.0-only MIT
diff --git a/batctl/Makefile b/batctl/Makefile
index 242f101..70ca771 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
-PKG_VERSION:=2023.0
+PKG_VERSION:=2023.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-PKG_HASH:=11071ec02b61e01e05ef8030b7bda8ff15e5c70b294a64204592c5b6cb31ed22
+PKG_HASH:=e5bf47305d955abb199244bd0e5fffab96108b1affabd0d9705533f8059395f1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 0d22a1e..4ef2953 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_VERSION:=2023.0
-PKG_RELEASE:=1
+PKG_VERSION:=2023.1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-PKG_HASH:=2ce4ec04063252e7bfec3a2b3fa2a61b3b42c7b04d698ba60132bfab1d60a5cd
+PKG_HASH:=f46a7286660a5ec3506a1be7ef60b471c51ac70550597d598040479ab7b936b8
 PKG_EXTMOD_SUBDIRS:=net/batman-adv
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
diff --git a/batman-adv/patches/0004-Revert-batman-adv-Migrate-to-linux-container_of.h.patch b/batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
index fbf1ef6..fbf1ef6 100644
--- a/batman-adv/patches/0004-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
+++ b/batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
diff --git a/batman-adv/patches/0001-batman-adv-Fix-build-of-multicast-code-against-Linux.patch b/batman-adv/patches/0001-batman-adv-Fix-build-of-multicast-code-against-Linux.patch
deleted file mode 100644
index 4a84f5f..0000000
--- a/batman-adv/patches/0001-batman-adv-Fix-build-of-multicast-code-against-Linux.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Fri, 14 May 2021 19:34:35 +0200
-Subject: batman-adv: Fix build of multicast code against Linux < 5.13
-
-Fixes: 007b4c4b031f ("batman-adv: convert ifmcaddr6 to RCU")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-
---- a/net/batman-adv/multicast.c
-+++ b/net/batman-adv/multicast.c
-@@ -431,9 +431,14 @@ batadv_mcast_mla_softif_get_ipv6(struct
- 		return 0;
- 	}
- 
-+#if LINUX_VERSION_IS_LESS(5, 13, 0)
-+	read_lock_bh(&in6_dev->lock);
-+	for (pmc6 = in6_dev->mc_list; pmc6; pmc6 = pmc6->next) {
-+#else
- 	for (pmc6 = rcu_dereference(in6_dev->mc_list);
- 	     pmc6;
- 	     pmc6 = rcu_dereference(pmc6->next)) {
-+#endif
- 		if (IPV6_ADDR_MC_SCOPE(&pmc6->mca_addr) <
- 		    IPV6_ADDR_SCOPE_LINKLOCAL)
- 			continue;
-@@ -462,6 +467,9 @@ batadv_mcast_mla_softif_get_ipv6(struct
- 		hlist_add_head(&new->list, mcast_list);
- 		ret++;
- 	}
-+#if LINUX_VERSION_IS_LESS(5, 13, 0)
-+	read_unlock_bh(&in6_dev->lock);
-+#endif
- 	rcu_read_unlock();
- 
- 	return ret;
diff --git a/batman-adv/patches/0002-Revert-batman-adv-Switch-to-kstrtox.h-for-kstrtou64.patch b/batman-adv/patches/0002-Revert-batman-adv-Switch-to-kstrtox.h-for-kstrtou64.patch
deleted file mode 100644
index 8a2c0e2..0000000
--- a/batman-adv/patches/0002-Revert-batman-adv-Switch-to-kstrtox.h-for-kstrtou64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Tue, 14 Sep 2021 21:02:10 +0200
-Subject: Revert "batman-adv: Switch to kstrtox.h for kstrtou64"
-
-This header is only available after Linux 5.14
-
-This reverts commit c9a69cb4048ebef3a4d91835669011a26d9b7dab.
-
---- a/net/batman-adv/gateway_common.c
-+++ b/net/batman-adv/gateway_common.c
-@@ -10,7 +10,7 @@
- #include <linux/atomic.h>
- #include <linux/byteorder/generic.h>
- #include <linux/errno.h>
--#include <linux/kstrtox.h>
-+#include <linux/kernel.h>
- #include <linux/limits.h>
- #include <linux/math64.h>
- #include <linux/netdevice.h>
diff --git a/batman-adv/patches/0005-fix-batadv_is_cfg80211_netdev.patch b/batman-adv/patches/0002-fix-batadv_is_cfg80211_netdev.patch
index 9ac66b8..9ac66b8 100644
--- a/batman-adv/patches/0005-fix-batadv_is_cfg80211_netdev.patch
+++ b/batman-adv/patches/0002-fix-batadv_is_cfg80211_netdev.patch
diff --git a/batman-adv/patches/0003-Revert-batman-adv-use-Linux-s-stdarg.h.patch b/batman-adv/patches/0003-Revert-batman-adv-use-Linux-s-stdarg.h.patch
deleted file mode 100644
index ce2df71..0000000
--- a/batman-adv/patches/0003-Revert-batman-adv-use-Linux-s-stdarg.h.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Tue, 14 Sep 2021 21:07:34 +0200
-Subject: Revert "batman-adv: use Linux's stdarg.h"
-
-This header is only available since Linux 5.15
-
-This reverts commit 36d059797a14f0e373fdc3c79df7b467435925ad.
-
---- a/net/batman-adv/log.c
-+++ b/net/batman-adv/log.c
-@@ -7,7 +7,7 @@
- #include "log.h"
- #include "main.h"
- 
--#include <linux/stdarg.h>
-+#include <stdarg.h>
- 
- #include "trace.h"
- 
diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h
index 646e179..fcf7b93 100644
--- a/batman-adv/src/compat-hacks.h
+++ b/batman-adv/src/compat-hacks.h
@@ -5,49 +5,6 @@
 #include <linux/version.h>	/* LINUX_VERSION_CODE */
 #include <linux/types.h>
 
-#if LINUX_VERSION_IS_LESS(5, 14, 0)
-
-#include <linux/if_bridge.h>
-#include <net/addrconf.h>
-
-#if IS_ENABLED(CONFIG_IPV6)
-static inline bool
-br_multicast_has_router_adjacent(struct net_device *dev, int proto)
-{
-	struct list_head bridge_mcast_list = LIST_HEAD_INIT(bridge_mcast_list);
-	struct br_ip_list *br_ip_entry, *tmp;
-	int ret;
-
-	if (proto != ETH_P_IPV6)
-		return true;
-
-	ret = br_multicast_list_adjacent(dev, &bridge_mcast_list);
-	if (ret < 0)
-		return true;
-
-	ret = false;
-
-	list_for_each_entry_safe(br_ip_entry, tmp, &bridge_mcast_list, list) {
-		if (br_ip_entry->addr.proto == htons(ETH_P_IPV6) &&
-		    ipv6_addr_is_ll_all_routers(&br_ip_entry->addr.dst.ip6))
-			ret = true;
-
-		list_del(&br_ip_entry->list);
-		kfree(br_ip_entry);
-	}
-
-	return ret;
-}
-#else
-static inline bool
-br_multicast_has_router_adjacent(struct net_device *dev, int proto)
-{
-	return true;
-}
-#endif
-
-#endif /* LINUX_VERSION_IS_LESS(5, 14, 0) */
-
 #if LINUX_VERSION_IS_LESS(6, 0, 0)
 
 #define __vstring(item, fmt, ap) __dynamic_array(char, item, 256)
@@ -71,6 +28,20 @@ static inline u32 batadv_get_random_u32_below(u32 ep_ro)
 
 #endif /* LINUX_VERSION_IS_LESS(6, 2, 0) */
 
+#if LINUX_VERSION_IS_LESS(6, 4, 0)
+
+#include <linux/if_vlan.h>
+
+/* Prefer this version in TX path, instead of
+ * skb_reset_mac_header() + vlan_eth_hdr()
+ */
+static inline struct vlan_ethhdr *skb_vlan_eth_hdr(const struct sk_buff *skb)
+{
+	return (struct vlan_ethhdr *)skb->data;
+}
+
+#endif /* LINUX_VERSION_IS_LESS(6, 4, 0) */
+
 /* <DECLARE_EWMA> */
 
 #include <linux/version.h>