compat: skb_mark_not_on_list will be backported to Ubuntu 18.04

Thadeu Lima de Souza Cascardo · zx2c4 · commit cad80597c794 · 2021-02-18T20:28:54.000+01:00
linux commit 22f6bbb7bcfcef0b373b0502a7ff390275c575dd ("net: use
skb_list_del_init() to remove from RX sublists") will be backported to Ubuntu
18.04 default kernel, which is based on linux 4.15.

Signed-off-by: Thadeu Lima de Souza Cascardo &lt;cascardo@canonical.com&gt;
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) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8) && !defined(ISUBUNTU1804)) || 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) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8)) \|\| LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217)`
	`826`	`+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8) && !defined(ISUBUNTU1804)) \|\| 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;`