From 0eb78d98d82e1bf46cc1a017418ecd6cc7bf98b1 Mon Sep 17 00:00:00 2001 From: Rani Hod Date: Sat, 23 Dec 2023 14:38:34 +0200 Subject: [PATCH] batman-adv: fix 2023.3 compilation issue Fixes: 28b8a5eafe6e05b Closes: #1036 Compilation failed due to redefinition of `skb_vlan_eth_hdr`; Removed the relevant lines from `compat-hacks.h` and now it's fine. Signed-off-by: Rani Hod --- batman-adv/Makefile | 2 +- batman-adv/src/compat-hacks.h | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index ea48f3a..71e98e2 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2023.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h index fcf7b93..cb2a7ab 100644 --- a/batman-adv/src/compat-hacks.h +++ b/batman-adv/src/compat-hacks.h @@ -28,20 +28,6 @@ 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 - -/* 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) */ - /* */ #include