Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

batman-adv: fix 2023.3 compilation issue

Browse source 
Fixes: 28b8a5eafe
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 <rani.hod@gmail.com>
This commit is contained in:
Rani Hod 2023-12-23 14:38:34 +02:00
parent a5ec54aee3
commit 0eb78d98d8
2 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
batman-adv/Makefile
View file

@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv PKG_NAME:=batman-adv
PKG_VERSION:=2023.3 PKG_VERSION:=2023.3
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

14
batman-adv/src/compat-hacks.h
View file

@ -28,20 +28,6 @@ static inline u32 batadv_get_random_u32_below(u32 ep_ro)
#endif /* LINUX_VERSION_IS_LESS(6, 2, 0) */ #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> */ /* <DECLARE_EWMA> */
#include <linux/version.h> #include <linux/version.h>