build: remove support for Linux 2.6.22

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 000feb1c532d130681e71e136399ed4fdd5bbfef..f9a75b7a2f6b893edac297541c5dd3c0b074e938 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,7 +2,7 @@
 HEAD
 ====
 Changes:
-- remove support for Linux 2.6.17--2.6.21
+- remove support for Linux 2.6.17--2.6.22
 
 
 v1.47.1 (2010-10-15)

diff --git a/extensions/compat_xtables.c b/extensions/compat_xtables.c
index d60f8ee91aaf9ca6d2c76b26ff3f863203bdc3ea..ced1e7772407ea86c706d1f84ed880f77365529d 100644 (file)
--- a/extensions/compat_xtables.c
+++ b/extensions/compat_xtables.c
@@ -30,18 +30,11 @@
 #      define WITH_IPV6 1
 #endif
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 22)
-static int xtnu_match_run(const struct sk_buff *skb,
-    const struct net_device *in, const struct net_device *out,
-    const struct xt_match *cm, const void *matchinfo, int offset,
-    unsigned int protoff, int *hotdrop)
-#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
 static bool xtnu_match_run(const struct sk_buff *skb,
     const struct net_device *in, const struct net_device *out,
     const struct xt_match *cm, const void *matchinfo, int offset,
     unsigned int protoff, bool *hotdrop)
-#endif
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
 {
        struct xtnu_match *nm = xtcompat_numatch(cm);
        bool lo_ret;
@@ -88,14 +81,9 @@ static bool xtnu_match_run(const struct sk_buff *skb,
 }
 #endif
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 22)
-static int xtnu_match_check(const char *table, const void *entry,
-    const struct xt_match *cm, void *matchinfo, unsigned int hook_mask)
-#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
 static bool xtnu_match_check(const char *table, const void *entry,
     const struct xt_match *cm, void *matchinfo, unsigned int hook_mask)
-#endif
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
 {
        struct xtnu_match *nm = xtcompat_numatch(cm);
        struct xt_mtchk_param local_par = {
@@ -283,14 +271,9 @@ xtnu_target_run(struct sk_buff *skb, const struct xt_action_param *par)
 }
 #endif
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 22)
-static int xtnu_target_check(const char *table, const void *entry,
-    const struct xt_target *ct, void *targinfo, unsigned int hook_mask)
-#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
 static bool xtnu_target_check(const char *table, const void *entry,
     const struct xt_target *ct, void *targinfo, unsigned int hook_mask)
-#endif
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
 {
        struct xtnu_target *nt = xtcompat_nutarget(ct);
        struct xt_tgchk_param local_par = {

diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index 651ed22a9594a92a16073383a4e6ffe8389125b0..3d2affb62736ba7613393b6755446897d78246cf 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(2, 6, 22)
-#      warning Kernels below 2.6.22 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
+#      warning Kernels below 2.6.23 not supported.
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
@@ -17,16 +17,8 @@
 #              warning You have CONFIG_NF_CONNTRACK enabled, but CONFIG_NF_CONNTRACK_MARK is not (please enable).
 #      endif
 #      include <net/netfilter/nf_conntrack.h>
-#elif defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
-#      if !defined(CONFIG_IP_NF_CONNTRACK_MARK)
-#              warning You have CONFIG_IP_NF_CONNTRACK enabled, but CONFIG_IP_NF_CONNTRACK_MARK is not (please enable).
-#      endif
-#      include <linux/netfilter_ipv4/ip_conntrack.h>
-#      define nf_conn ip_conntrack
-#      define nf_ct_get ip_conntrack_get
-#      define nf_conntrack_untracked ip_conntrack_untracked
 #else
-#      warning You need either CONFIG_NF_CONNTRACK or CONFIG_IP_NF_CONNTRACK.
+#      warning You need CONFIG_NF_CONNTRACK.
 #endif
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 24)

diff --git a/extensions/xt_CHAOS.c b/extensions/xt_CHAOS.c
index 7c76d6ef82aafba2f2f9df235230140126c4641b..01a63a6a37784396c94e60948207242fd5a74ec3 100644 (file)
--- a/extensions/xt_CHAOS.c
+++ b/extensions/xt_CHAOS.c
@@ -54,11 +54,7 @@ xt_chaos_total(struct sk_buff *skb, const struct xt_action_param *par)
        const int fragoff       = ntohs(iph->frag_off) & IP_OFFSET;
        typeof(xt_tarpit) destiny;
        bool ret;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 22)
-       int hotdrop = false;
-#else
        bool hotdrop = false;
-#endif
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
        ret = xm_tcp->match(skb, par->in, par->out, xm_tcp, &tcp_params,