build: add support for Linux 4.18

diff --git a/.gitignore b/.gitignore
index 950e3f5efc5e618a6c8af80dd3679d1e30b2e7fe..a9de2840a9de58ba5620b1bcc7f156a05d01340e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.lo
 *.loT
 *.o
+.cache.mk
 .deps/
 .dirstamp
 .libs/

diff --git a/configure.ac b/configure.ac
index 5338f9aaa07cffebb43ddfb7195e6e349e44d40e..eeccd22bd9dd98d9160e6ef59cfaf151882d1b25 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,9 +57,9 @@ if test -n "$kbuilddir"; then
                echo "WARNING: Version detection did not succeed. Continue at own luck.";
        else
                echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
-               if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 17; then
+               if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 18; then
                        echo "WARNING: That kernel version is not officially supported yet. Continue at own luck.";
-               elif test "$kmajor" -eq 4 -a "$kminor" -ge 17; then
+               elif test "$kmajor" -eq 4 -a "$kminor" -ge 18; then
                        :
                else
                        echo "WARNING: That kernel version is not officially supported.";

diff --git a/doc/changelog.txt b/doc/changelog.txt
index c742d427824b979c72a7151197939bcd39224092..dfab1ee6e2b58f65484cc4a190bef2f240851ecc 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,7 +2,7 @@
 HEAD
 ====
 Enhancements:
-- support for Linux 4.17
+- support for Linux 4.17, 4.18
 
 
 v3.0 (2018-02-12)

diff --git a/extensions/xt_DNETMAP.c b/extensions/xt_DNETMAP.c
index 1b415c390c022b2baf71c0303aa0fa761cb3fd1a..de7d4ec2333d40ab59760613d918b1750897cbe9 100644 (file)
--- a/extensions/xt_DNETMAP.c
+++ b/extensions/xt_DNETMAP.c
@@ -363,7 +363,11 @@ dnetmap_tg(struct sk_buff *skb, const struct xt_action_param *par)
        __be32 prenat_ip, postnat_ip, prenat_ip_prev;
        const struct xt_DNETMAP_tginfo *tginfo = par->targinfo;
        const struct nf_nat_range *mr = &tginfo->prefix;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0)
+       struct nf_nat_range2 newrange;
+#else
        struct nf_nat_range newrange;
+#endif
        struct dnetmap_entry *e;
        struct dnetmap_prefix *p;
        __s32 jttl;