diff --git a/configure.ac b/configure.ac index 6a45601..2dfd048 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,7 @@ else fi; fi; echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; -if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 32; then +if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 34; then echo "WARNING: You are trying a newer kernel. Results may vary. :-)"; elif test \( "$kmajor" -lt 2 -o "$kminor" -lt 6 -o "$kmicro" -lt 17 \) -o \ \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \ diff --git a/doc/changelog.txt b/doc/changelog.txt index f22c13d..c4b261e 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -1,6 +1,7 @@ HEAD ==== +- build: support for Linux 2.6.34 - build: remove unused --with-ksource option - build: remove unneeded --with-xtables option - build: fix compilations in RAWNAT, SYSRQ and length2 when CONFIG_IPV6=n diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h index 77ea3b4..343fca6 100644 --- a/extensions/compat_xtables.h +++ b/extensions/compat_xtables.h @@ -78,6 +78,15 @@ # define inet_proto_csum_replace4 xtnu_proto_csum_replace4 #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) +# define ipt_unregister_table(tbl) ipt_unregister_table(&init_net, (tbl)) +# define ip6t_unregister_table(tbl) ip6t_unregister_table(&init_net, (tbl)) +#else +# define ipt_unregister_table(tbl) ipt_unregister_table(tbl) +# define ip6t_unregister_table(tbl) ip6t_unregister_table(tbl) +#endif + + #if !defined(NIP6) && !defined(NIP6_FMT) # define NIP6(addr) \ ntohs((addr).s6_addr16[0]), \