diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-05-04 19:36:14 -0600 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-05-04 19:36:14 -0600 |
| commit | 1325bedf8ee3d69ed58460b7a8fee96d949f67da (patch) | |
| tree | 37f56c9d05937d7a5972e924a9ebc2c05e7e6833 /src/compat | |
| parent | 2ab4726cc2808f1c9e8acac5120ae7be6a090ebb (diff) | |
compat: Ubuntu 19.10 and 18.04-hwe backported skb_reset_redirect
Reported-by: Pascal Ernster <pascal.ernster@rub.de>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/compat')
| -rw-r--r-- | src/compat/compat.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compat/compat.h b/src/compat/compat.h index f90bcfa..4275b02 100644 --- a/src/compat/compat.h +++ b/src/compat/compat.h @@ -26,8 +26,10 @@ #ifdef UTS_UBUNTU_RELEASE_ABI #if LINUX_VERSION_CODE == KERNEL_VERSION(3, 13, 11) #define ISUBUNTU1404 -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) #define ISUBUNTU1604 +#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) +#define ISUBUNTU1910 #endif #endif #ifdef CONFIG_SUSE_KERNEL @@ -1018,7 +1020,7 @@ out: #define COMPAT_CANNOT_USE_MAX_MTU #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 29) || (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 14)) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 14) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 29) && !defined(ISUBUNTU1910)) #include <linux/skbuff.h> #include <net/sch_generic.h> static inline void skb_reset_redirect(struct sk_buff *skb) |