build: remove support for Linux 2.6.21

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 79bf6cac9f5d1574768d268ad835efe9e49d061b..000feb1c532d130681e71e136399ed4fdd5bbfef 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,7 +2,7 @@
 HEAD
 ====
 Changes:
-- remove support for Linux 2.6.17--2.6.20
+- remove support for Linux 2.6.17--2.6.21
 
 
 v1.47.1 (2010-10-15)

diff --git a/extensions/compat_rawpost.h b/extensions/compat_rawpost.h
index 44d298ee970255f3c834d9a1d0698383894a7cf7..20554d22440fa233867bfb839d92f30fc8b9baf7 100644 (file)
--- a/extensions/compat_rawpost.h
+++ b/extensions/compat_rawpost.h
@@ -7,59 +7,4 @@ typedef struct sk_buff sk_buff_t;
 typedef struct sk_buff *sk_buff_t;
 #endif
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 21)
-#define XT_TARGET_INIT(__name, __size)                                        \
-{                                                                             \
-       .target.u.user = {                                                     \
-               .target_size    = XT_ALIGN(__size),                            \
-               .name           = __name,                                      \
-       },                                                                     \
-}
-
-#define IPT_ENTRY_INIT(__size)                                                \
-{                                                                             \
-       .target_offset  = sizeof(struct ipt_entry),                            \
-       .next_offset    = (__size),                                            \
-}
-
-#define IPT_STANDARD_INIT(__verdict)                                          \
-{                                                                             \
-       .entry          = IPT_ENTRY_INIT(sizeof(struct ipt_standard)),         \
-       .target         = XT_TARGET_INIT(IPT_STANDARD_TARGET,                  \
-                                        sizeof(struct xt_standard_target)),   \
-       .target.verdict = -(__verdict) - 1,                                    \
-}
-
-#define IPT_ERROR_INIT                                                        \
-{                                                                             \
-       .entry          = IPT_ENTRY_INIT(sizeof(struct ipt_error)),            \
-       .target         = XT_TARGET_INIT(IPT_ERROR_TARGET,                     \
-                                        sizeof(struct ipt_error_target)),     \
-       .target.errorname = "ERROR",                                           \
-}
-
-#define IP6T_ENTRY_INIT(__size)                                                       \
-{                                                                             \
-       .target_offset  = sizeof(struct ip6t_entry),                           \
-       .next_offset    = (__size),                                            \
-}
-
-#define IP6T_STANDARD_INIT(__verdict)                                         \
-{                                                                             \
-       .entry          = IP6T_ENTRY_INIT(sizeof(struct ip6t_standard)),       \
-       .target         = XT_TARGET_INIT(IP6T_STANDARD_TARGET,                 \
-                                        sizeof(struct ip6t_standard_target)), \
-       .target.verdict = -(__verdict) - 1,                                    \
-}
-
-#define IP6T_ERROR_INIT                                                               \
-{                                                                             \
-       .entry          = IP6T_ENTRY_INIT(sizeof(struct ip6t_error)),          \
-       .target         = XT_TARGET_INIT(IP6T_ERROR_TARGET,                    \
-                                        sizeof(struct ip6t_error_target)),    \
-       .target.errorname = "ERROR",                                           \
-}
-
-#endif /* 2.6.21 */
-
 #endif /* XTA_COMPAT_RAWPOST_H */

diff --git a/extensions/compat_skbuff.h b/extensions/compat_skbuff.h
index c5700c9580702538fdac148ee5b77d2c4b994716..6453cdfdfcd81d507648a19d969b55495dc7dde3 100644 (file)
--- a/extensions/compat_skbuff.h
+++ b/extensions/compat_skbuff.h
@@ -35,24 +35,4 @@ static inline struct rtable *skb_rtable(const struct sk_buff *skb)
 #      define skb_secmark(skb) 0
 #endif
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 21)
-#      define ip_hdr(skb) ((skb)->nh.iph)
-#      define ip_hdrlen(skb) (ip_hdr(skb)->ihl * 4)
-#      define ipv6_hdr(skb) ((skb)->nh.ipv6h)
-#      define skb_network_header(skb) ((skb)->nh.raw)
-#      define skb_transport_header(skb) ((skb)->h.raw)
-static inline void skb_reset_network_header(struct sk_buff *skb)
-{
-       skb->nh.raw = skb->data;
-}
-static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb)
-{
-       return (void *)skb_transport_header(skb);
-}
-static inline struct udphdr *udp_hdr(const struct sk_buff *skb)
-{
-       return (void *)skb_transport_header(skb);
-}
-#endif
-
 #endif /* COMPAT_SKBUFF_H */

diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index 551f10c4f14853e709487c4e95ab22b9b69b20cc..651ed22a9594a92a16073383a4e6ffe8389125b0 100644 (file)
--- 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, 21)
-#      warning Kernels below 2.6.21 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
+#      warning Kernels below 2.6.22 not supported.
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)