build: remove support for Linux 4.8

diff --git a/configure.ac b/configure.ac
index 987abd10c5d8c2ccd9dfd13327445504023904ec..0bf8a71cd56bd6ff8355c6b80358f7bb715a7c7a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ if test -n "$kbuilddir"; then
                echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
                if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 12; then
                        echo "WARNING: That kernel version is not officially supported yet. Continue at own luck.";
-               elif test "$kmajor" -eq 4 -a "$kminor" -le 7; then
+               elif test "$kmajor" -eq 4 -a "$kminor" -le 8; then
                        echo "WARNING: That kernel version is not officially supported.";
                elif test "$kmajor" -eq 4 -a "$kminor" -le 10; then
                        :;

diff --git a/doc/changelog.txt b/doc/changelog.txt
index c5bac48a8071603dc8a9419f1ecb369477f2e81b..27f138612615ad89fe9261a2eb4d99ec11b2db99 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -4,7 +4,7 @@ HEAD
 Enhancements:
 - support for Linux up to 4.15
 Changes:
-- remove support for Linux 3.7--4.7
+- remove support for Linux 3.7--4.8
 
 
 v2.14 (2017-11-22)

diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index 043e7b1058c1706db1afc63dd426aff666c87bfb..23785d9a6673c4f07db245e5f86993c4884b8dd0 100644 (file)
--- a/extensions/compat_xtables.h
+++ b/extensions/compat_xtables.h
@@ -8,8 +8,8 @@
 
 #define DEBUGP Use__pr_debug__instead
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
-#      warning Kernels below 4.8 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
+#      warning Kernels below 4.9 not supported.
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

diff --git a/extensions/xt_LOGMARK.c b/extensions/xt_LOGMARK.c
index 38d96d3d005147e9b0c33ed67dafb8a21ee5d547..02e32be2a63bff67507ec6af758523d1b0a155ca 100644 (file)
--- a/extensions/xt_LOGMARK.c
+++ b/extensions/xt_LOGMARK.c
@@ -64,12 +64,7 @@ static void logmark_ct(const struct nf_conn *ct, enum ip_conntrack_info ctinfo)
                printk("%s""CONFIRMED", prev ? "," : "");
                prev = true;
        }
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)
        printk(" lifetime=%lus", nf_ct_expires(ct) / HZ);
-#else
-       printk(" lifetime=%lus",
-              (jiffies - ct->timeout.expires) / HZ);
-#endif
 }
 
 static unsigned int