diff options
| author | Thadeu Lima de Souza Cascardo <cascardo@canonical.com> | 2021-04-23 14:19:38 -0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2021-07-23 02:44:13 +0300 |
| commit | eced6917c9b7280ede5be64cbaa1bee5992e2ceb (patch) | |
| tree | 385f392857199e47c31b164ca5960a20e8ebdf0f | |
| parent | 34b05b3805e198382ff82dbe622950142aec343b (diff) | |
Revert "compat: skb_mark_not_on_list will be backported to Ubuntu 18.04"
This reverts commit cad80597c7947f0def83caf8cb56aff0149c83a8.
Because this commit has not been backported so far, due to the implications
of building Ubuntu's backport of wireguard in a timely manner.
For now, reverting this fix would allow wireguard-linux-compat CI to work
on Ubuntu 18.04.
A different fix or the same one can be applied again when the time is
right.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Change-Id: I5eadc2e7ca7495a012c7f3fb1a9dcd8eabdbe139
| -rw-r--r-- | drivers/net/wireguard/compat/compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireguard/compat/compat.h b/drivers/net/wireguard/compat/compat.h index 26a6d7ec2d6b..91d4388824ea 100644 --- a/drivers/net/wireguard/compat/compat.h +++ b/drivers/net/wireguard/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) && !defined(ISUBUNTU1804)) || 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)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217) static inline void skb_mark_not_on_list(struct sk_buff *skb) { skb->next = NULL; |