diff options
| author | Sven Eckelmann <sven@narfation.org> | 2023-05-27 12:09:02 +0200 |
|---|---|---|
| committer | Sven Eckelmann <sven@narfation.org> | 2023-05-27 12:09:02 +0200 |
| commit | 6afc0452c2534ed0bc65b59b1fb6fd74439ddf27 (patch) | |
| tree | 570ef8c2730e199e54d75776cda5ee67f82f9312 | |
| parent | e8856b93da72f9d1a8490a59cdba5ecfbe76c84e (diff) | |
batman-adv: update to version 2023.1
* support latest kernels (4.14 - 6.4)
* drop single unicast transfer optimization for unsnoopable IP addresses
* prepare infrastructure for multicast packets with multiple unicast destination
addresses
Signed-off-by: Sven Eckelmann <sven@narfation.org>
| -rw-r--r-- | batman-adv/Makefile | 4 | ||||
| -rw-r--r-- | batman-adv/patches/0001-batman-adv-Fix-build-of-multicast-code-against-Linux.patch | 4 | ||||
| -rw-r--r-- | batman-adv/src/compat-hacks.h | 14 |
3 files changed, 18 insertions, 4 deletions
diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 0d22a1e..bf41944 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_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> 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 index 4a84f5f..31f28b0 100644 --- 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 @@ -7,7 +7,7 @@ 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 +@@ -430,9 +430,14 @@ batadv_mcast_mla_softif_get_ipv6(struct return 0; } @@ -22,7 +22,7 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org> 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++; } diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h index 646e179..ee51b87 100644 --- a/batman-adv/src/compat-hacks.h +++ b/batman-adv/src/compat-hacks.h @@ -71,6 +71,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> |