build: remove support for Linux 4.3

diff --git a/configure.ac b/configure.ac
index dcb92e3f98b86cf616e4e5b49c8e863e74f80f6c..f91c649ccdbfe8fe2be0be7ace85ccc353149317 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 2; then
+               elif test "$kmajor" -eq 4 -a "$kminor" -le 3; 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 13f70867117359f8214bf972b05e4cbb2c793714..e763e02f2e9a49e5ad1c51224bd3fa629a2ef75b 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.2
+- remove support for Linux 3.7--4.3
 
 
 v2.14 (2017-11-22)

diff --git a/extensions/ACCOUNT/xt_ACCOUNT.c b/extensions/ACCOUNT/xt_ACCOUNT.c
index 4705fa7acca66815904ea4daaa1e55ae20b98349..bd455dfaa01bab42d21e2ed5db07cbcc0232f764 100644 (file)
--- a/extensions/ACCOUNT/xt_ACCOUNT.c
+++ b/extensions/ACCOUNT/xt_ACCOUNT.c
@@ -485,12 +485,7 @@ ipt_acc_target(struct sk_buff *skb, const struct xt_action_param *par)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
        struct ipt_acc_net *ian = net_generic(par->state->net, ipt_acc_net_id);
 #else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
        struct ipt_acc_net *ian = net_generic(par->net, ipt_acc_net_id);
-#else
-       struct net *net = dev_net(par->in ? par->in : par->out);
-       struct ipt_acc_net *ian = net_generic(net, ipt_acc_net_id);
-#endif
 #endif
        struct ipt_acc_table *ipt_acc_tables = ian->ipt_acc_tables;
        const struct ipt_acc_info *info =

diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index 89ff025f3c876adb02561c350f1f6b5579f43810..2e7de44ce360c46f6cf7d6d92829ce5e341f9238 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, 3, 0)
-#      warning Kernels below 4.3 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
+#      warning Kernels below 4.4 not supported.
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
@@ -42,23 +42,12 @@
 #      define NIPQUAD_FMT "%hhu.%hhu.%hhu.%hhu"
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
-#      define ip6_local_out(xnet, xsk, xskb) ip6_local_out(xskb)
-#      define ip6_route_me_harder(xnet, xskb) ip6_route_me_harder(xskb)
-#      define ip_local_out(xnet, xsk, xskb) ip_local_out(xskb)
-#      define ip_route_me_harder(xnet, xskb, xaddrtype) ip_route_me_harder((xskb), (xaddrtype))
-#endif
-
 static inline struct net *par_net(const struct xt_action_param *par)
 {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
        return par->state->net;
 #else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
        return par->net;
-#else
-       return dev_net((par->in != NULL) ? par->in : par->out);
-#endif
 #endif
 }
 

diff --git a/extensions/xt_TARPIT.c b/extensions/xt_TARPIT.c
index e152c9b6499cbd8b441f435028aabe2839555d8d..b78683c686f0138336e0cba290ea398892901a63 100644 (file)
--- a/extensions/xt_TARPIT.c
+++ b/extensions/xt_TARPIT.c
@@ -278,14 +278,8 @@ static void tarpit_tcp4(struct net *net, struct sk_buff *oldskb,
                goto free_nskb;
 
        nf_ct_attach(nskb, oldskb);
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
        NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, net, nskb->sk, nskb, NULL,
                skb_dst(nskb)->dev, dst_output);
-#else
-       NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, nskb->sk, nskb, NULL,
-               skb_dst(nskb)->dev, dst_output_sk);
-#endif
        return;
 
  free_nskb:
@@ -398,14 +392,8 @@ static void tarpit_tcp6(struct net *net, struct sk_buff *oldskb,
        nskb->ip_summed = CHECKSUM_NONE;
 
        nf_ct_attach(nskb, oldskb);
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
        NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, net, nskb->sk, nskb, NULL,
                skb_dst(nskb)->dev, dst_output);
-#else
-       NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, nskb->sk, nskb, NULL,
-               skb_dst(nskb)->dev, dst_output_sk);
-#endif
        return;
 
  free_nskb: