build: additional compilation fixes for Linux 3.2/3.3

diff --git a/extensions/compat_xtables.c b/extensions/compat_xtables.c
index 9e96c0d7de5c3c2349678b9e502587d9e2613ea8..c5b67a486721945d2491dbb64010ee56b02ba567 100644 (file)
--- a/extensions/compat_xtables.c
+++ b/extensions/compat_xtables.c
@@ -8,7 +8,9 @@
  */
 #include <linux/ip.h>
 #include <linux/kernel.h>
+#include <linux/kmod.h>
 #include <linux/list.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/version.h>
@@ -17,6 +19,9 @@
 #include <linux/netfilter_arp.h>
 #include <net/ip.h>
 #include <net/route.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
+#      include <linux/export.h>
+#endif
 #include "compat_skbuff.h"
 #include "compat_xtnu.h"
 

diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index 4cfd3e604b801251d7d6bbb73348fdbc34ef88e3..06d34b14e4d4ec64a96525a7cb35ff6c2492c115 100644 (file)
--- a/extensions/compat_xtables.h
+++ b/extensions/compat_xtables.h
@@ -92,7 +92,7 @@
 #      define rt_dst(rt)       (&(rt)->u.dst)
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
 #      define nf_nat_ipv4_multi_range_compat nf_nat_multi_range_compat
 #      define nf_nat_ipv4_range nf_nat_range
 #      define NF_NAT_RANGE_MAP_IPS IP_NAT_RANGE_MAP_IPS

diff --git a/extensions/xt_DNETMAP.c b/extensions/xt_DNETMAP.c
index 7ca16a36e9795f3c5da5f0f08a85a6946b699d41..4fec6b66f238187c573b5b9ac72624887e23ab29 100644 (file)
--- a/extensions/xt_DNETMAP.c
+++ b/extensions/xt_DNETMAP.c
@@ -31,8 +31,13 @@
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
 #endif
-#include "xt_DNETMAP.h"
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+#      include <net/netfilter/nf_nat.h>
+#else
+#      include <linux/netfilter/nf_nat.h>
+#endif
 #include "compat_xtables.h"
+#include "xt_DNETMAP.h"
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Marek Kierdelewicz <marek@koba.pl>");

diff --git a/extensions/xt_DNETMAP.h b/extensions/xt_DNETMAP.h
index 274b0838e90ee90ab88ff6a6e7bc465f377551de..04250be5a07c72e4216b4f0edaa7ae91e0766605 100644 (file)
--- a/extensions/xt_DNETMAP.h
+++ b/extensions/xt_DNETMAP.h
@@ -8,7 +8,11 @@ enum {
 };
 
 struct xt_DNETMAP_tginfo {
+#ifdef __KERNEL__
        struct nf_nat_ipv4_multi_range_compat prefix;
+#else
+       struct nf_nat_multi_range_compat prefix;
+#endif
        __u8 flags;
        __s16 ttl;
 };

diff --git a/extensions/xt_STEAL.c b/extensions/xt_STEAL.c
index e8d3e4cff3f13e3ae15821960b0d52898e2946de..260f55eecab3fbab230ac66e0ac5cfdbf3483b71 100644 (file)
--- a/extensions/xt_STEAL.c
+++ b/extensions/xt_STEAL.c
@@ -3,6 +3,7 @@
  *     written by Jan Engelhardt <jengelh [at] medozas de>, 2008 - 2009
  *     placed in the Public Domain
  */
+#include <linux/module.h>
 #include <linux/netfilter.h>
 #include <linux/skbuff.h>
 #include "compat_xtables.h"

diff --git a/extensions/xt_quota2.c b/extensions/xt_quota2.c
index d6442b633259bf1fda6edba7005e4a490195ed5b..20005dda582beb0443c29317963e79e091b840fd 100644 (file)
--- a/extensions/xt_quota2.c
+++ b/extensions/xt_quota2.c
@@ -12,6 +12,7 @@
  *     version 2, as published by the Free Software Foundation.
  */
 #include <linux/list.h>
+#include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>