anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-06 04:35:12 +02:00
Code Issues Releases Wiki Activity

build: remove support for Linux 3.4

Browse Source
This commit is contained in:
Jan Engelhardt
2012-10-16 04:05:38 +02:00
parent 91da2a0dbd
commit c243c78af4
5 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL
View File

@@ -14,7 +14,7 @@ Supported configurations for this release
* iptables >= 1.4.5 * iptables >= 1.4.5
* kernel-devel >= 3.4 * kernel-devel >= 3.5
with prepared build/output directory with prepared build/output directory
- CONFIG_NF_CONNTRACK or CONFIG_IP_NF_CONNTRACK - CONFIG_NF_CONNTRACK or CONFIG_IP_NF_CONNTRACK
- CONFIG_NF_CONNTRACK_MARK or CONFIG_IP_NF_CONNTRACK_MARK - CONFIG_NF_CONNTRACK_MARK or CONFIG_IP_NF_CONNTRACK_MARK

2
configure.ac
View File

@@ -65,7 +65,7 @@ if test -n "$kbuilddir"; then
echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
if test "$kmajor" -gt 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 6; then if test "$kmajor" -gt 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 6; then
echo "WARNING: That kernel version is not officially supported."; echo "WARNING: That kernel version is not officially supported.";
elif test "$kmajor" -eq 3 -a "$kminor" -ge 4; then elif test "$kmajor" -eq 3 -a "$kminor" -ge 5; then
:; :;
else else
echo "WARNING: That kernel version is not officially supported."; echo "WARNING: That kernel version is not officially supported.";

2
doc/changelog.txt
View File

@@ -2,7 +2,7 @@
HEAD HEAD
==== ====
Changes: Changes:
- remove support for Linux 2.6.17–3.3 - remove support for Linux 2.6.17–3.4
- remove xt_TEE (this is available upstream since 2.6.35) - remove xt_TEE (this is available upstream since 2.6.35)
- remove xt_CHECKSUM (this is available upstream since 2.6.36) - remove xt_CHECKSUM (this is available upstream since 2.6.36)

9
extensions/compat_xtables.c
View File

@@ -154,13 +154,4 @@ void *HX_memmem(const void *space, size_t spacesize,
} }
EXPORT_SYMBOL_GPL(HX_memmem); EXPORT_SYMBOL_GPL(HX_memmem);
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) && defined(WITH_IPV6)
int xtnu_ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
int target, unsigned short *fragoff, int *fragflg)
{
return ipv6_find_hdr(skb, offset, target, fragoff);
}
EXPORT_SYMBOL_GPL(xtnu_ipv6_find_hdr);
#endif
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

8
extensions/compat_xtables.h
View File

@@ -8,8 +8,8 @@
#define DEBUGP Use__pr_debug__instead #define DEBUGP Use__pr_debug__instead
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0)
# warning Kernels below 3.4 not supported. # warning Kernels below 3.5 not supported.
#endif #endif
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
@@ -47,10 +47,6 @@
# define NIPQUAD_FMT "%u.%u.%u.%u" # define NIPQUAD_FMT "%u.%u.%u.%u"
#endif #endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0)
# define ipv6_find_hdr xtnu_ipv6_find_hdr
#endif
#define ip_route_me_harder xtnu_ip_route_me_harder #define ip_route_me_harder xtnu_ip_route_me_harder
#define skb_make_writable xtnu_skb_make_writable #define skb_make_writable xtnu_skb_make_writable
#define xt_target xtnu_target #define xt_target xtnu_target