X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=openwrt%2Ftarget%2Flinux%2Fgeneric-2.4%2Fpatches%2F610-netfilter_connbytes.patch;h=95bc10f2bcd6247ff9dccc76c9134a600b1b45b2;hb=244b1f9d20092144ee161adee420252b1deaee82;hp=d9761171c624c4a907dcc3e2a77b584862753d19;hpb=8441d05cd095b89d0a9a7997cd138ead6818f525;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/openwrt/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch b/openwrt/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch
index d9761171c6..95bc10f2bc 100644
--- a/openwrt/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch
+++ b/openwrt/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch
@@ -415,3 +415,25 @@
 +};
 +
 +#endif
+--- linux-2.4.32/net/ipv4/netfilter/ip_conntrack_proto_gre.c	2006-02-04 19:16:25.000000000 +0100
++++ /home/florian//openwrt/trunk/openwrt/build_mipsel/linux/net/ipv4/netfilter/ip_conntrack_proto_gre.c	2006-02-04 18:19:08.000000000 +0100
+@@ -237,16 +237,16 @@
+ /* Returns verdict for packet, and may modify conntrack */
+ static int gre_packet(struct ip_conntrack *ct,
+ 		      struct iphdr *iph, size_t len,
+-		      enum ip_conntrack_info conntrackinfo)
++		      enum ip_conntrack_info ctinfo)
+ {
+ 	/* If we've seen traffic both ways, this is a GRE connection.
+ 	 * Extend timeout. */
+ 	if (ct->status & IPS_SEEN_REPLY) {
+-		ip_ct_refresh_acct(ct, ct->proto.gre.stream_timeout);
++		ip_ct_refresh_acct(ct, ctinfo, iph, ct->proto.gre.stream_timeout);
+ 		/* Also, more likely to be important, and not a probe. */
+ 		set_bit(IPS_ASSURED_BIT, &ct->status);
+ 	} else
+-		ip_ct_refresh_acct(ct, ct->proto.gre.timeout);
++		ip_ct_refresh_acct(ct, ctinfo, iph, ct->proto.gre.timeout);
+ 	
+ 	return NF_ACCEPT;
+ }