Skip to content

Commit 1edffe2

Browse files
Thadeu Lima de Souza Cascardozx2c4
authored andcommitted
Revert "compat: skb_mark_not_on_list will be backported to Ubuntu 18.04"
This reverts commit cad8059. 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>
1 parent 2cf9543 commit 1edffe2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/compat/compat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ static __always_inline void old_rcu_barrier(void)
823823
#define COMPAT_CANNOT_DEPRECIATE_BH_RCU
824824
#endif
825825

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)
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)
827827
static inline void skb_mark_not_on_list(struct sk_buff *skb)
828828
{
829829
skb->next = NULL;

0 commit comments

Comments
 (0)