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

build: remove support for Linux 2.6.30

Browse Source
This commit is contained in:
Jan Engelhardt
2012-10-16 00:38:13 +02:00
parent 28d12faba8
commit 3ba7d8c3a9
4 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/changelog.txt
View File

@@ -2,7 +2,7 @@
HEAD HEAD
==== ====
Changes: Changes:
- remove support for Linux 2.6.17--2.6.29 - remove support for Linux 2.6.17--2.6.30
v1.47.1 (2010-10-15) v1.47.1 (2010-10-15)

17
extensions/compat_skbuff.h
View File

@@ -4,23 +4,6 @@
struct tcphdr; struct tcphdr;
struct udphdr; struct udphdr;
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 30)
static inline void skb_dst_set(struct sk_buff *skb, struct dst_entry *dst)
{
skb->dst = dst;
}
static inline struct dst_entry *skb_dst(const struct sk_buff *skb)
{
return skb->dst;
}
static inline struct rtable *skb_rtable(const struct sk_buff *skb)
{
return (void *)skb->dst;
}
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 32) #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 32)
# define skb_ifindex(skb) (skb)->iif # define skb_ifindex(skb) (skb)->iif
# define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark) # define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark)

8
extensions/compat_xtables.c
View File

@@ -30,7 +30,7 @@
# define WITH_IPV6 1 # define WITH_IPV6 1
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && \ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) && \
LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34) LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
static bool xtnu_match_run(const struct sk_buff *skb, static bool xtnu_match_run(const struct sk_buff *skb,
const struct xt_match_param *par) const struct xt_match_param *par)
@@ -56,7 +56,7 @@ static bool xtnu_match_run(const struct sk_buff *skb,
} }
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && \ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) && \
LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34) LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
static bool xtnu_match_check(const struct xt_mtchk_param *par) 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); EXPORT_SYMBOL_GPL(xtnu_unregister_matches);
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && \ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) && \
LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34) LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
static unsigned int static unsigned int
xtnu_target_run(struct sk_buff *skb, const struct xt_target_param *par) 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 #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && \ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) && \
LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34) LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
static bool xtnu_target_check(const struct xt_tgchk_param *par) static bool xtnu_target_check(const struct xt_tgchk_param *par)
{ {

4
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(2, 6, 30) #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
# warning Kernels below 2.6.30 not supported. # warning Kernels below 2.6.31 not supported.
#endif #endif
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)