compat: skb_mark_not_on_list was backported to 4.14

zx2c4 · zx2c4 · commit 1bb90881971c · 2021-01-24T14:09:09.000+01:00
Signed-off-by: Jason A. Donenfeld &lt;Jason@zx2c4.com&gt;
diff --git a/src/compat/compat.h b/src/compat/compat.h
@@ -823,7 +823,7 @@ static __always_inline void old_rcu_barrier(void)
 #define COMPAT_CANNOT_DEPRECIATE_BH_RCU
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && !defined(ISRHEL8)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217)
 static inline void skb_mark_not_on_list(struct sk_buff *skb)
 {
 	skb->next = NULL;

Original file line number	Diff line number	Diff line change
`@@ -823,7 +823,7 @@ static __always_inline void old_rcu_barrier(void)`
`823`	`823`	`#define COMPAT_CANNOT_DEPRECIATE_BH_RCU`
`824`	`824`	`#endif`
`825`	`825`
`826`		`-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && !defined(ISRHEL8)`
	`826`	`+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8)) \|\| LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217)`
`827`	`827`	`static inline void skb_mark_not_on_list(struct sk_buff *skb)`
`828`	`828`	`{`
`829`	`829`	`skb->next = NULL;`