include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv
-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:=2ce4ec04063252e7bfec3a2b3fa2a61b3b42c7b04d698ba60132bfab1d60a5cd
+PKG_HASH:=f46a7286660a5ec3506a1be7ef60b471c51ac70550597d598040479ab7b936b8
PKG_EXTMOD_SUBDIRS:=net/batman-adv
PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
-@@ -431,9 +431,14 @@ batadv_mcast_mla_softif_get_ipv6(struct
+@@ -430,9 +430,14 @@ batadv_mcast_mla_softif_get_ipv6(struct
return 0;
}
if (IPV6_ADDR_MC_SCOPE(&pmc6->mca_addr) <
IPV6_ADDR_SCOPE_LINKLOCAL)
continue;
-@@ -462,6 +467,9 @@ batadv_mcast_mla_softif_get_ipv6(struct
+@@ -461,6 +466,9 @@ batadv_mcast_mla_softif_get_ipv6(struct
hlist_add_head(&new->list, mcast_list);
ret++;
}
#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>