build: remove support for Linux 2.6.32

diff --git a/INSTALL b/INSTALL
index 2677d34ad7f01526720d8a6307bf64d87bbcc0ef..5d1cc2806b577419eb1afc44eec2db6fca64a732 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ Supported configurations for this release
 
        * iptables >= 1.4.5
 
-       * kernel-devel >= 2.6.32
+       * kernel-devel >= 2.6.33
          with prepared build/output directory
          - CONFIG_NF_CONNTRACK or CONFIG_IP_NF_CONNTRACK
          - CONFIG_NF_CONNTRACK_MARK or CONFIG_IP_NF_CONNTRACK_MARK

diff --git a/configure.ac b/configure.ac
index 0cc28ad52ab80d0b79a41cb2e178d7d59d1601b8..49b06f4a586fdc341f424b543a32e8ec64d367fa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ if test -n "$kbuilddir"; then
                        echo "WARNING: That kernel version is not officially supported.";
                elif test "$kmajor" -eq 3; then
                        :;
-               elif test "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -ge 32; then
+               elif test "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -ge 33; then
                        :;
                else
                        echo "WARNING: That kernel version is not officially supported.";

diff --git a/doc/api/2.6.17.c b/doc/api/2.6.17.c
deleted file mode 100644 (file)
index 08a431d..0000000
--- a/doc/api/2.6.17.c
+++ /dev/null
@@ -1,64 +0,0 @@
-match:
-
-       /* true/false */
-       int
-       (*match)(
-               const struct sk_buff *skb,
-               const struct net_device *in,
-               const struct net_device *out,
-               const struct xt_match *match,
-               const void *matchinfo,
-               int offset,
-               unsigned int protoff,
-               int *hotdrop,
-       );
-
-       /* true/false */
-       int
-       (*checkentry)(
-               const char *tablename,
-               const void *ip,
-               const struct xt_match *match,
-               void *matchinfo,
-               unsigned int matchinfosize,
-               unsigned int hook_mask,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_match *match,
-               void *matchinfo,
-               unsigned int matchinfosize,
-       );
-
-target:
-
-       /* verdict */
-       unsigned int
-       (*target)(
-               struct sk_buff **pskb,
-               const struct net_device *in,
-               const struct net_device *out,
-               unsigned int hooknum,
-               const struct xt_target *target,
-               const void *targinfo,
-               void *userdata,
-       );
-
-       /* true/false */
-       int
-       (*checkentry)(
-               const char *tablename,
-               const void *entry,
-               const struct xt_target *target,
-               void *targinfo,
-               unsigned int targinfosize,
-               unsigned int hook_mask,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_target *target,
-               void *targinfo,
-               unsigned int targinfosize,
-       );

diff --git a/doc/api/2.6.19.c b/doc/api/2.6.19.c
deleted file mode 100644 (file)
index 5fd48da..0000000
--- a/doc/api/2.6.19.c
+++ /dev/null
@@ -1,59 +0,0 @@
-match:
-
-       /* true/false */
-       int
-       (*match)(
-               const struct sk_buff *skb,
-               const struct net_device *in,
-               const struct net_device *out,
-               const struct xt_match *match,
-               const void *matchinfo,
-               int offset,
-               unsigned int protoff,
-               int *hotdrop,
-       );
-
-       /* true/false */
-       int
-       (*checkentry)(
-               const char *tablename,
-               const void *ip,
-               const struct xt_match *match,
-               void *matchinfo,
-               unsigned int hook_mask,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_match *match,
-               void *matchinfo,
-       );
-
-target:
-
-       /* verdict */
-       unsigned int
-       (*target)(
-               struct sk_buff **pskb,
-               const struct net_device *in,
-               const struct net_device *out,
-               unsigned int hooknum,
-               const struct xt_target *target,
-               const void *targinfo,
-       );
-
-       /* true/false */
-       int
-       (*checkentry)(
-               const char *tablename,
-               const void *entry,
-               const struct xt_target *target,
-               void *targinfo,
-               unsigned int hook_mask,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_target *target,
-               void *targinfo,
-       );

diff --git a/doc/api/2.6.23.c b/doc/api/2.6.23.c
deleted file mode 100644 (file)
index 6cc91b2..0000000
--- a/doc/api/2.6.23.c
+++ /dev/null
@@ -1,59 +0,0 @@
-match:
-
-       /* true/false */
-       bool
-       (*match)(
-               const struct sk_buff *skb,
-               const struct net_device *in,
-               const struct net_device *out,
-               const struct xt_match *match,
-               const void *matchinfo,
-               int offset,
-               unsigned int protoff,
-               bool *hotdrop,
-       );
-
-       /* true/false */
-       bool
-       (*checkentry)(
-               const char *tablename,
-               const void *ip,
-               const struct xt_match *match,
-               void *matchinfo,
-               unsigned int hook_mask,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_match *match,
-               void *matchinfo,
-       );
-
-target:
-
-       /* verdict */
-       unsigned int
-       (*target)(
-               struct sk_buff **pskb,
-               const struct net_device *in,
-               const struct net_device *out,
-               unsigned int hooknum,
-               const struct xt_target *target,
-               const void *targinfo,
-       );
-
-       /* true/false */
-       bool
-       (*checkentry)(
-               const char *tablename,
-               const void *entry,
-               const struct xt_target *target,
-               void *targinfo,
-               unsigned int hook_mask,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_target *target,
-               void *targinfo,
-       );

diff --git a/doc/api/2.6.24.c b/doc/api/2.6.24.c
deleted file mode 100644 (file)
index c411fde..0000000
--- a/doc/api/2.6.24.c
+++ /dev/null
@@ -1,59 +0,0 @@
-match:
-
-       /* true/false */
-       bool
-       (*match)(
-               const struct sk_buff *skb,
-               const struct net_device *in,
-               const struct net_device *out,
-               const struct xt_match *match,
-               const void *matchinfo,
-               int offset,
-               unsigned int protoff,
-               bool *hotdrop,
-       );
-
-       /* true/false */
-       bool
-       (*checkentry)(
-               const char *tablename,
-               const void *ip,
-               const struct xt_match *match,
-               void *matchinfo,
-               unsigned int hook_mask,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_match *match,
-               void *matchinfo,
-       );
-
-target:
-
-       /* verdict */
-       unsigned int
-       (*target)(
-               struct sk_buff *skb,
-               const struct net_device *in,
-               const struct net_device *out,
-               unsigned int hooknum,
-               const struct xt_target *target,
-               const void *targinfo,
-       );
-
-       /* true/false */
-       bool
-       (*checkentry)(
-               const char *tablename,
-               const void *entry,
-               const struct xt_target *target,
-               void *targinfo,
-               unsigned int hook_mask,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_target *target,
-               void *targinfo,
-       );

diff --git a/doc/api/2.6.28.c b/doc/api/2.6.28.c
deleted file mode 100644 (file)
index bb35a28..0000000
--- a/doc/api/2.6.28.c
+++ /dev/null
@@ -1,39 +0,0 @@
-match:
-
-       /* true/false */
-       bool
-       (*match)(
-               const struct sk_buff *skb,
-               const struct xt_match_param *,
-       );
-
-       /* true/false */
-       bool
-       (*checkentry)(
-               const struct xt_mtchk_param *,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_mtdtor_param *,
-       );
-
-target:
-
-       /* verdict */
-       unsigned int
-       (*target)(
-               struct sk_buff *skb,
-               const struct xt_target_param *,
-       );
-
-       /* true/false */
-       bool
-       (*checkentry)(
-               const struct xt_tgchk_param *,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_tgdtor_param *,
-       );

diff --git a/doc/api/2.6.31.c b/doc/api/2.6.31.c
deleted file mode 100644 (file)
index ba98011..0000000
--- a/doc/api/2.6.31.c
+++ /dev/null
@@ -1,38 +0,0 @@
-match:
-
-       /* true/false */
-       bool
-       (*match)(
-               const struct sk_buff *skb,
-               const struct xt_match_param *,
-       );
-
-       /* true/false */
-       bool
-       (*checkentry)(
-               const struct xt_mtchk_param *,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_mtdtor_param *,
-       );
-
-target:
-
-       unsigned int
-       (*target)(
-               struct sk_buff *skb,
-               const struct xt_target_param *,
-       );
-
-       /* true/false */
-       bool
-       (*checkentry)(
-               const struct xt_tgchk_param *,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_tgdtor_param *,
-       );

diff --git a/doc/api/2.6.32.c b/doc/api/2.6.32.c
deleted file mode 100644 (file)
index bb35a28..0000000
--- a/doc/api/2.6.32.c
+++ /dev/null
@@ -1,39 +0,0 @@
-match:
-
-       /* true/false */
-       bool
-       (*match)(
-               const struct sk_buff *skb,
-               const struct xt_match_param *,
-       );
-
-       /* true/false */
-       bool
-       (*checkentry)(
-               const struct xt_mtchk_param *,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_mtdtor_param *,
-       );
-
-target:
-
-       /* verdict */
-       unsigned int
-       (*target)(
-               struct sk_buff *skb,
-               const struct xt_target_param *,
-       );
-
-       /* true/false */
-       bool
-       (*checkentry)(
-               const struct xt_tgchk_param *,
-       );
-
-       void
-       (*destroy)(
-               const struct xt_tgdtor_param *,
-       );

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 2d971d4abe242a97f2106c0f7470c9e55d4e208d..9c090ebdfe46b8de6bd0970a2656c07100653a65 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.31
+- remove support for Linux 2.6.17--2.6.32
 
 
 v1.47.1 (2010-10-15)

diff --git a/extensions/compat_skbuff.h b/extensions/compat_skbuff.h
index b1e31b6f074778298357c9ab4064bef8b52afb48..ba064c12426bc172fb9cf52376036f640a6ad192 100644 (file)
--- a/extensions/compat_skbuff.h
+++ b/extensions/compat_skbuff.h
@@ -4,13 +4,8 @@
 struct tcphdr;
 struct udphdr;
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 32)
-#      define skb_ifindex(skb) (skb)->iif
-#      define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark)
-#else
-#      define skb_ifindex(skb) (skb)->skb_iif
-#      define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark)
-#endif
+#define skb_ifindex(skb) (skb)->skb_iif
+#define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark)
 
 #ifdef CONFIG_NETWORK_SECMARK
 #      define skb_secmark(skb) ((skb)->secmark)

diff --git a/extensions/compat_xtables.c b/extensions/compat_xtables.c
index ae42d9e7331e97f132de08d450507d1abe549a20..4f3d14ffe79941e3e8d11b75b6ce9f049fb5a3be 100644 (file)
--- a/extensions/compat_xtables.c
+++ b/extensions/compat_xtables.c
@@ -30,7 +30,7 @@
 #      define WITH_IPV6 1
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32) && \
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) && \
     LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
 static bool xtnu_match_run(const struct sk_buff *skb,
     const struct xt_match_param *par)
@@ -56,7 +56,7 @@ static bool xtnu_match_run(const struct sk_buff *skb,
 }
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32) && \
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) && \
     LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
 static bool xtnu_match_check(const struct xt_mtchk_param *par)
 {
@@ -146,7 +146,7 @@ void xtnu_unregister_matches(struct xtnu_match *nt, unsigned int num)
 EXPORT_SYMBOL_GPL(xtnu_unregister_matches);
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32) && \
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) && \
     LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
 static unsigned int
 xtnu_target_run(struct sk_buff *skb, const struct xt_target_param *par)
@@ -174,7 +174,7 @@ xtnu_target_run(struct sk_buff *skb, const struct xt_action_param *par)
 }
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32) && \
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) && \
     LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
 static bool xtnu_target_check(const struct xt_tgchk_param *par)
 {

diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index d418c58e17ffac5a90f3c5ae187caaff41182ecc..91bf5c9fb52c5606e35fd57384dcb3627540cdeb 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, 32)
-#      warning Kernels below 2.6.32 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+#      warning Kernels below 2.6.33 not supported.
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)