diff options
| author | Simon Wunderlich <sw@simonwunderlich.de> | 2023-12-23 18:05:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-23 18:05:49 +0100 |
| commit | 2a3bad8349f1fad631aea8daa4f20343a8cc4457 (patch) | |
| tree | 0b0968c62508fb06ddbef9d17dd46569e0058d11 | |
| parent | 81cdbd3b62ed07834a8cd2203adb73fc358f8271 (diff) | |
| parent | b848b61afa13fc15d1b3ec9eb4fb28723050c4f8 (diff) | |
Merge pull request #1039 from ecsv/batadv-for-23.05openwrt-23.05
openwrt-23.05: batman-adv: compat: Fix skb_vlan_eth_hdr conflict in stable kernels
| -rw-r--r-- | batman-adv/Makefile | 2 | ||||
| -rw-r--r-- | batman-adv/src/compat-hacks.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 6026b66..0345911 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2023.1 -PKG_RELEASE:=4 +PKG_RELEASE:=5 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..364e312 100644 --- a/batman-adv/src/compat-hacks.h +++ b/batman-adv/src/compat-hacks.h @@ -28,7 +28,10 @@ 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) +#if LINUX_VERSION_IS_LESS(6, 4, 0) && \ + !(LINUX_VERSION_IS_GEQ(5, 10, 205) && LINUX_VERSION_IS_LESS(5, 11, 0)) && \ + !(LINUX_VERSION_IS_GEQ(5, 15, 144) && LINUX_VERSION_IS_LESS(5, 16, 0)) && \ + !(LINUX_VERSION_IS_GEQ(6, 1, 69) && LINUX_VERSION_IS_LESS(6, 2, 0)) #include <linux/if_vlan.h> |