From: Peter Denison Date: Thu, 21 Jun 2007 21:29:37 +0000 (+0000) Subject: make 130-netfilter-ipset.patch apply under 2.6.22-rc[45] X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8fb92b3a2f89ce6aa4a64c6897fde5e3bd70cee6;p=librecmc%2Flibrecmc.git make 130-netfilter-ipset.patch apply under 2.6.22-rc[45] SVN-Revision: 7694 --- diff --git a/target/linux/generic-2.6/patches-2.6.22/130-netfilter-ipset.patch b/target/linux/generic-2.6/patches-2.6.22/130-netfilter-ipset.patch index 6c3db5b132..a9b3c35430 100644 --- a/target/linux/generic-2.6/patches-2.6.22/130-netfilter-ipset.patch +++ b/target/linux/generic-2.6/patches-2.6.22/130-netfilter-ipset.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set.h +Index: linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set.h 2007-06-17 01:56:58.435888424 +0200 ++++ linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set.h 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,498 @@ +#ifndef _IP_SET_H +#define _IP_SET_H @@ -501,10 +501,10 @@ Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set.h +#endif /* __KERNEL__ */ + +#endif /*_IP_SET_H*/ -Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_iphash.h +Index: linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_iphash.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_iphash.h 2007-06-17 01:56:58.435888424 +0200 ++++ linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_iphash.h 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,30 @@ +#ifndef __IP_SET_IPHASH_H +#define __IP_SET_IPHASH_H @@ -536,10 +536,10 @@ Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_iphash.h +}; + +#endif /* __IP_SET_IPHASH_H */ -Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_ipmap.h +Index: linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_ipmap.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_ipmap.h 2007-06-17 01:56:58.436888272 +0200 ++++ linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_ipmap.h 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,56 @@ +#ifndef __IP_SET_IPMAP_H +#define __IP_SET_IPMAP_H @@ -597,10 +597,10 @@ Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_ipmap.h +} + +#endif /* __IP_SET_IPMAP_H */ -Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_ipporthash.h +Index: linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_ipporthash.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_ipporthash.h 2007-06-17 01:56:58.436888272 +0200 ++++ linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_ipporthash.h 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,34 @@ +#ifndef __IP_SET_IPPORTHASH_H +#define __IP_SET_IPPORTHASH_H @@ -636,10 +636,10 @@ Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_ipporthash.h +}; + +#endif /* __IP_SET_IPPORTHASH_H */ -Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_iptree.h +Index: linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_iptree.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_iptree.h 2007-06-17 01:56:58.436888272 +0200 ++++ linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_iptree.h 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,40 @@ +#ifndef __IP_SET_IPTREE_H +#define __IP_SET_IPTREE_H @@ -681,10 +681,10 @@ Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_iptree.h +}; + +#endif /* __IP_SET_IPTREE_H */ -Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_macipmap.h +Index: linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_macipmap.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_macipmap.h 2007-06-17 01:56:58.437888120 +0200 ++++ linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_macipmap.h 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,38 @@ +#ifndef __IP_SET_MACIPMAP_H +#define __IP_SET_MACIPMAP_H @@ -724,10 +724,10 @@ Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_macipmap.h +}; + +#endif /* __IP_SET_MACIPMAP_H */ -Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_malloc.h +Index: linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_malloc.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_malloc.h 2007-06-17 01:56:58.437888120 +0200 ++++ linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_malloc.h 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,116 @@ +#ifndef _IP_SET_MALLOC_H +#define _IP_SET_MALLOC_H @@ -845,10 +845,10 @@ Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_malloc.h +#endif /* __KERNEL__ */ + +#endif /*_IP_SET_MALLOC_H*/ -Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_nethash.h +Index: linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_nethash.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_nethash.h 2007-06-17 01:56:58.437888120 +0200 ++++ linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_nethash.h 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,55 @@ +#ifndef __IP_SET_NETHASH_H +#define __IP_SET_NETHASH_H @@ -905,10 +905,10 @@ Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_nethash.h +} + +#endif /* __IP_SET_NETHASH_H */ -Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_portmap.h +Index: linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_portmap.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_portmap.h 2007-06-17 01:56:58.437888120 +0200 ++++ linux-2.6.22-rc5/include/linux/netfilter_ipv4/ip_set_portmap.h 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,25 @@ +#ifndef __IP_SET_PORTMAP_H +#define __IP_SET_PORTMAP_H @@ -935,10 +935,10 @@ Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ip_set_portmap.h +}; + +#endif /* __IP_SET_PORTMAP_H */ -Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ipt_set.h +Index: linux-2.6.22-rc5/include/linux/netfilter_ipv4/ipt_set.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/include/linux/netfilter_ipv4/ipt_set.h 2007-06-17 01:56:58.437888120 +0200 ++++ linux-2.6.22-rc5/include/linux/netfilter_ipv4/ipt_set.h 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,21 @@ +#ifndef _IPT_SET_H +#define _IPT_SET_H @@ -961,10 +961,10 @@ Index: linux-2.6.22-rc4/include/linux/netfilter_ipv4/ipt_set.h +}; + +#endif /*_IPT_SET_H*/ -Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set.c +Index: linux-2.6.22-rc5/net/ipv4/netfilter/ip_set.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/net/ipv4/netfilter/ip_set.c 2007-06-17 01:56:58.439887816 +0200 ++++ linux-2.6.22-rc5/net/ipv4/netfilter/ip_set.c 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,2001 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson + * Patrick Schaaf @@ -2967,10 +2967,10 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set.c + +module_init(init); +module_exit(fini); -Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_iphash.c +Index: linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_iphash.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_iphash.c 2007-06-17 01:57:56.984987608 +0200 ++++ linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_iphash.c 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,413 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik + * @@ -3385,10 +3385,10 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_iphash.c + +module_init(init); +module_exit(fini); -Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipmap.c +Index: linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_ipmap.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipmap.c 2007-06-17 01:57:56.985987456 +0200 ++++ linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_ipmap.c 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,327 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson + * Patrick Schaaf @@ -3717,10 +3717,10 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipmap.c + +module_init(init); +module_exit(fini); -Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipporthash.c +Index: linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_ipporthash.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipporthash.c 2007-06-17 01:57:56.985987456 +0200 ++++ linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_ipporthash.c 2007-06-20 20:00:06.000000000 +0100 @@ -0,0 +1,535 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik + * @@ -3757,7 +3757,7 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipporthash.c +static inline ip_set_ip_t +get_port(const struct sk_buff *skb, u_int32_t flags) +{ -+ struct iphdr *iph = skb->nh.iph; ++ struct iphdr *iph = ip_hdr(skb); + u_int16_t offset = ntohs(iph->frag_off) & IP_OFFSET; + + switch (iph->protocol) { @@ -3768,7 +3768,7 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipporthash.c + if (offset) + return INVALID_PORT; + -+ if (skb_copy_bits(skb, skb->nh.iph->ihl*4, &tcph, sizeof(tcph)) < 0) ++ if (skb_copy_bits(skb, ip_hdrlen(skb), &tcph, sizeof(tcph)) < 0) + /* No choice either */ + return INVALID_PORT; + @@ -3781,7 +3781,7 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipporthash.c + if (offset) + return INVALID_PORT; + -+ if (skb_copy_bits(skb, skb->nh.iph->ihl*4, &udph, sizeof(udph)) < 0) ++ if (skb_copy_bits(skb, ip_hdrlen(skb), &udph, sizeof(udph)) < 0) + /* No choice either */ + return INVALID_PORT; + @@ -3871,8 +3871,8 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipporthash.c + + DP("flag: %s src: %u.%u.%u.%u dst: %u.%u.%u.%u", + flags[index] & IPSET_SRC ? "SRC" : "DST", -+ NIPQUAD(skb->nh.iph->saddr), -+ NIPQUAD(skb->nh.iph->daddr)); ++ NIPQUAD(ip_hdr(skb)->saddr), ++ NIPQUAD(ip_hdr(skb)->daddr)); + DP("flag %s port %u", + flags[index+1] & IPSET_SRC ? "SRC" : "DST", + port); @@ -3881,8 +3881,8 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipporthash.c + + return __testip(set, + ntohl(flags[index] & IPSET_SRC -+ ? skb->nh.iph->saddr -+ : skb->nh.iph->daddr), ++ ? ip_hdr(skb)->saddr ++ : ip_hdr(skb)->daddr), + port, + hash_ip); +} @@ -3956,8 +3956,8 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipporthash.c + + DP("flag: %s src: %u.%u.%u.%u dst: %u.%u.%u.%u", + flags[index] & IPSET_SRC ? "SRC" : "DST", -+ NIPQUAD(skb->nh.iph->saddr), -+ NIPQUAD(skb->nh.iph->daddr)); ++ NIPQUAD(ip_hdr(skb)->saddr), ++ NIPQUAD(ip_hdr(skb)->daddr)); + DP("flag %s port %u", + flags[index+1] & IPSET_SRC ? "SRC" : "DST", + port); @@ -3966,8 +3966,8 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipporthash.c + + return __addip((struct ip_set_ipporthash *) set->data, + ntohl(flags[index] & IPSET_SRC -+ ? skb->nh.iph->saddr -+ : skb->nh.iph->daddr), ++ ? ip_hdr(skb)->saddr ++ : ip_hdr(skb)->daddr), + port, + hash_ip); +} @@ -4101,8 +4101,8 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipporthash.c + + DP("flag: %s src: %u.%u.%u.%u dst: %u.%u.%u.%u", + flags[index] & IPSET_SRC ? "SRC" : "DST", -+ NIPQUAD(skb->nh.iph->saddr), -+ NIPQUAD(skb->nh.iph->daddr)); ++ NIPQUAD(ip_hdr(skb)->saddr), ++ NIPQUAD(ip_hdr(skb)->daddr)); + DP("flag %s port %u", + flags[index+1] & IPSET_SRC ? "SRC" : "DST", + port); @@ -4111,8 +4111,8 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipporthash.c + + return __delip(set, + ntohl(flags[index] & IPSET_SRC -+ ? skb->nh.iph->saddr -+ : skb->nh.iph->daddr), ++ ? ip_hdr(skb)->saddr ++ : ip_hdr(skb)->daddr), + port, + hash_ip); +} @@ -4257,10 +4257,10 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_ipporthash.c + +module_init(init); +module_exit(fini); -Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_iptree.c +Index: linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_iptree.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_iptree.c 2007-06-17 01:57:56.985987456 +0200 ++++ linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_iptree.c 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,571 @@ +/* Copyright (C) 2005 Jozsef Kadlecsik + * @@ -4833,10 +4833,10 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_iptree.c + +module_init(init); +module_exit(fini); -Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_macipmap.c +Index: linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_macipmap.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_macipmap.c 2007-06-17 01:57:56.985987456 +0200 ++++ linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_macipmap.c 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,353 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson + * Patrick Schaaf @@ -5191,10 +5191,10 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_macipmap.c + +module_init(init); +module_exit(fini); -Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_nethash.c +Index: linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_nethash.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_nethash.c 2007-06-17 01:57:56.985987456 +0200 ++++ linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_nethash.c 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,481 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik + * @@ -5677,10 +5677,10 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_nethash.c + +module_init(init); +module_exit(fini); -Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_portmap.c +Index: linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_portmap.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_portmap.c 2007-06-17 01:57:56.985987456 +0200 ++++ linux-2.6.22-rc5/net/ipv4/netfilter/ip_set_portmap.c 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,334 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik + * @@ -6016,10 +6016,10 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ip_set_portmap.c + +module_init(init); +module_exit(fini); -Index: linux-2.6.22-rc4/net/ipv4/netfilter/ipt_set.c +Index: linux-2.6.22-rc5/net/ipv4/netfilter/ipt_set.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/net/ipv4/netfilter/ipt_set.c 2007-06-17 01:56:58.443887208 +0200 ++++ linux-2.6.22-rc5/net/ipv4/netfilter/ipt_set.c 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,150 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson + * Patrick Schaaf @@ -6171,10 +6171,10 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ipt_set.c + +module_init(ipt_ipset_init); +module_exit(ipt_ipset_fini); -Index: linux-2.6.22-rc4/net/ipv4/netfilter/ipt_SET.c +Index: linux-2.6.22-rc5/net/ipv4/netfilter/ipt_SET.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22-rc4/net/ipv4/netfilter/ipt_SET.c 2007-06-17 01:57:56.985987456 +0200 ++++ linux-2.6.22-rc5/net/ipv4/netfilter/ipt_SET.c 2007-06-19 23:19:01.000000000 +0100 @@ -0,0 +1,169 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson + * Patrick Schaaf @@ -6345,10 +6345,10 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/ipt_SET.c + +module_init(ipt_SET_init); +module_exit(ipt_SET_fini); -Index: linux-2.6.22-rc4/net/ipv4/netfilter/Kconfig +Index: linux-2.6.22-rc5/net/ipv4/netfilter/Kconfig =================================================================== ---- linux-2.6.22-rc4.orig/net/ipv4/netfilter/Kconfig 2007-06-17 01:56:52.055858336 +0200 -+++ linux-2.6.22-rc4/net/ipv4/netfilter/Kconfig 2007-06-17 01:56:58.443887208 +0200 +--- linux-2.6.22-rc5.orig/net/ipv4/netfilter/Kconfig 2007-06-19 23:19:01.000000000 +0100 ++++ linux-2.6.22-rc5/net/ipv4/netfilter/Kconfig 2007-06-20 19:20:37.000000000 +0100 @@ -426,5 +426,114 @@ Allows altering the ARP packet payload: source and destination hardware and network addresses. @@ -6464,10 +6464,10 @@ Index: linux-2.6.22-rc4/net/ipv4/netfilter/Kconfig + endmenu -Index: linux-2.6.22-rc4/net/ipv4/netfilter/Makefile +Index: linux-2.6.22-rc5/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.6.22-rc4.orig/net/ipv4/netfilter/Makefile 2007-06-17 01:56:52.065856816 +0200 -+++ linux-2.6.22-rc4/net/ipv4/netfilter/Makefile 2007-06-17 01:56:58.444887056 +0200 +--- linux-2.6.22-rc5.orig/net/ipv4/netfilter/Makefile 2007-06-19 23:19:01.000000000 +0100 ++++ linux-2.6.22-rc5/net/ipv4/netfilter/Makefile 2007-06-20 19:20:37.000000000 +0100 @@ -48,6 +48,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o