openwrt-mirror/routing
1
0
Fork 0
mirror of https://github.com/openwrt/routing.git synced 2026-05-27 23:01:00 +04:00
Code Issues Packages Projects Releases Wiki Activity

batman-adv: fix kmalloc_obj redefinition on stable 6.18.33+

Browse Source 
Linux 6.18.33 stable backported kmalloc_obj/kmalloc_objs/kzalloc_obj,
causing a redefinition conflict with compat-hacks.h which also defines
these for kernels before 7.0.0. Exclude the 6.18.33-6.18.x stable
range from the backport definitions.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@gmail.com>
This commit is contained in:
Janusz Dziedzic
2026-05-26 13:19:54 +02:00
parent 776e716063
commit 0aca212a95
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
batman-adv/Makefile
+1 -1
View File
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv
PKG_VERSION:=2026.1
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)
batman-adv/src/compat-hacks.h
+2 -1
View File
@@ -46,7 +46,8 @@ static inline u32 batadv_skb_crc32c(struct sk_buff *skb, int offset,
#endif /* LINUX_VERSION_IS_LESS(6, 16, 0) || !defined(CONFIG_NET_CRC32C) */
#if LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)
#if LINUX_VERSION_IS_LESS(7, 0, 0) && \
!(LINUX_VERSION_IS_GEQ(6, 18, 33) && LINUX_VERSION_IS_LESS(6, 19, 0))
#define kzalloc_obj(P, GFP) \
kzalloc(sizeof(P), GFP)