diff --git a/doc/changelog.txt b/doc/changelog.txt index 230d8b0..df7034b 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -2,7 +2,7 @@ HEAD ==== 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) diff --git a/extensions/compat_skbuff.h b/extensions/compat_skbuff.h index 6453cdf..b1e31b6 100644 --- a/extensions/compat_skbuff.h +++ b/extensions/compat_skbuff.h @@ -4,23 +4,6 @@ struct tcphdr; 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) # define skb_ifindex(skb) (skb)->iif # define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark) diff --git a/extensions/compat_xtables.c b/extensions/compat_xtables.c index e766b52..7adff99 100644 --- a/extensions/compat_xtables.c +++ b/extensions/compat_xtables.c @@ -30,7 +30,7 @@ # define WITH_IPV6 1 #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) static bool xtnu_match_run(const struct sk_buff *skb, const struct xt_match_param *par) @@ -56,7 +56,7 @@ static bool xtnu_match_run(const struct sk_buff *skb, } #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) 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); #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) static unsigned int 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 -#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) static bool xtnu_target_check(const struct xt_tgchk_param *par) { diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h index 6faaa91..6bb6182 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, 30) -# warning Kernels below 2.6.30 not supported. +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) +# warning Kernels below 2.6.31 not supported. #endif #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)