diff options
| author | Simon Wunderlich <sw@simonwunderlich.de> | 2023-12-23 18:05:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-23 18:05:57 +0100 |
| commit | 6f74738b725f8365c4c126b90f8f49f11e676720 (patch) | |
| tree | 28dea9e4f152d4b999040d49bba90607509771a6 /batman-adv/src | |
| parent | a5ec54aee3df6aa400e454ef0468127dcd0c6b25 (diff) | |
| parent | 96b5fa139c59baeb163b7b1d85bfe992c5b21133 (diff) | |
batman-adv: compat: Fix skb_vlan_eth_hdr conflict in stable kernels
Diffstat (limited to 'batman-adv/src')
| -rw-r--r-- | batman-adv/src/compat-hacks.h | 5 |
1 files changed, 4 insertions, 1 deletions
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> |