diff --git a/INSTALL b/INSTALL index 0f3b45d..9d049ab 100644 --- a/INSTALL +++ b/INSTALL @@ -14,7 +14,7 @@ Supported configurations for this release * iptables >= 1.4.5 - * kernel-devel >= 2.6.39 + * kernel-devel >= 3.0 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 b706a39..6318610 100644 --- a/configure.ac +++ b/configure.ac @@ -65,9 +65,7 @@ if test -n "$kbuilddir"; then echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; if test "$kmajor" -gt 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 6; 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 39; then + elif test "$kmajor" -eq 3 -a "$kminor" -ge 0; then :; else echo "WARNING: That kernel version is not officially supported."; diff --git a/doc/changelog.txt b/doc/changelog.txt index f67e1e7..d90b97f 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -2,7 +2,7 @@ HEAD ==== Changes: -- remove support for Linux 2.6.17–2.6.38 +- remove support for Linux 2.6.17–2.6.39 - remove xt_TEE (this is available upstream since 2.6.35) - remove xt_CHECKSUM (this is available upstream since 2.6.36) diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h index c11dad6..85fa226 100644 --- 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, 39) -# warning Kernels below 2.6.39 not supported. +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) +# warning Kernels below 3.0 not supported. #endif #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) diff --git a/extensions/xt_condition.c b/extensions/xt_condition.c index f16bce0..92014b5 100644 --- a/extensions/xt_condition.c +++ b/extensions/xt_condition.c @@ -150,9 +150,6 @@ static int condition_mt_check(const struct xt_mtchk_param *par) var->refcount = 1; var->enabled = false; -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 29) - var->status_proc->owner = THIS_MODULE; -#endif var->status_proc->data = var; wmb(); var->status_proc->read_proc = condition_proc_read; diff --git a/extensions/xt_quota2.c b/extensions/xt_quota2.c index 98fce70..c2c390a 100644 --- a/extensions/xt_quota2.c +++ b/extensions/xt_quota2.c @@ -128,9 +128,6 @@ q2_get_counter(const struct xt_quota_mtinfo2 *q) if (p == NULL || IS_ERR(p)) goto out; -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 29) - p->owner = THIS_MODULE; -#endif p->data = e; p->read_proc = quota_proc_read; p->write_proc = quota_proc_write;