tcp-window-tracking vs. pending/24_conntrack-nosysctl.patch

[netfilter@interlinx.bc.ca]

[-- Attachment #1: Type: text/plain, Size: 895 bytes --]

There is a patch in pending that makes the tcp-window-tracking patch
fail to apply cleanly.  The patch in
pending/24_conntrack-nosysctl.patch:

--- linux-2.4.21-pre5-ac3/net/ipv4/netfilter/ip_conntrack_core.c	Sat Mar 15 12:16:55 2003
+++ linux-2.4.21-pre5-ac3-fixed/net/ipv4/netfilter/ip_conntrack_core.c	Sat Mar 15 12:23:34 2003
@@ -1478,8 +1478,10 @@
 	ip_ct_attach = ip_conntrack_attach;
 	return ret;
 
+#ifdef CONFIG_SYSCTL
 err_free_ct_cachep:
 	kmem_cache_destroy(ip_conntrack_cachep);
+#endif /*CONFIG_SYSCTL*/
 err_free_hash:
 	vfree(ip_conntrack_hash);
 err_unreg_sockopt:


is not accounted for in hunk 5 to file
net/ipv4/netfilter/ip_conntrack_core.c in
extra/tcp-window-tracking.patch.

I guess the question is, should it be expected that patches in suites
like extra should apply if all of submitted and pending are applied.

b.

-- 
Brian J. Murrell

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]