diff -Nur patch-o-matic-ng-20060329.orig/patchlets/condition/linux/net/ipv4/netfilter/ipt_condition.c patch-o-matic-ng-20060329/patchlets/condition/linux/net/ipv4/netfilter/ipt_condition.c
--- patch-o-matic-ng-20060329.orig/patchlets/condition/linux/net/ipv4/netfilter/ipt_condition.c	2003-12-18 19:47:52.000000000 +0100
+++ patch-o-matic-ng-20060329/patchlets/condition/linux/net/ipv4/netfilter/ipt_condition.c	2006-03-30 23:41:13.000000000 +0200
@@ -92,7 +92,7 @@
 static int
 match(const struct sk_buff *skb, const struct net_device *in,
       const struct net_device *out, const void *matchinfo, int offset,
-      const void *hdr, u_int16_t datalen, int *hotdrop)
+      unsigned int protoff, int *hotdrop)
 {
 	const struct condition_info *info =
 	    (const struct condition_info *) matchinfo;
@@ -116,7 +116,7 @@
 
 
 static int
-checkentry(const char *tablename, const struct ipt_ip *ip,
+checkentry(const char *tablename, const void *ip,
 	   void *matchinfo, unsigned int matchsize, unsigned int hook_mask)
 {
 	struct condition_info *info = (struct condition_info *) matchinfo;
diff -Nur patch-o-matic-ng-20060329.orig/patchlets/condition/linux/net/ipv6/netfilter/ip6t_condition.c patch-o-matic-ng-20060329/patchlets/condition/linux/net/ipv6/netfilter/ip6t_condition.c
--- patch-o-matic-ng-20060329.orig/patchlets/condition/linux/net/ipv6/netfilter/ip6t_condition.c	2003-12-20 17:38:19.000000000 +0100
+++ patch-o-matic-ng-20060329/patchlets/condition/linux/net/ipv6/netfilter/ip6t_condition.c	2006-03-30 23:41:01.000000000 +0200
@@ -88,7 +88,7 @@
 static int
 match(const struct sk_buff *skb, const struct net_device *in,
       const struct net_device *out, const void *matchinfo, int offset,
-      const void *hdr, u_int16_t datalen, int *hotdrop)
+      unsigned int protoff, int *hotdrop)
 {
 	const struct condition6_info *info =
 	    (const struct condition6_info *) matchinfo;
@@ -112,7 +112,7 @@
 
 
 static int
-checkentry(const char *tablename, const struct ip6t_ip6 *ip,
+checkentry(const char *tablename, const void *ip,
 	   void *matchinfo, unsigned int matchsize, unsigned int hook_mask)
 {
 	struct condition6_info *info =
@@ -232,7 +232,7 @@
 	proc_net_condition = proc_mkdir("ip6t_condition", proc_net);
 
 	if (proc_net_condition) {
-	        errorcode = ipt_register_match(&condition_match);
+	        errorcode = ip6t_register_match(&condition_match);
 
 		if (errorcode)
 			remove_proc_entry("ip6t_condition", proc_net);
@@ -246,7 +246,7 @@
 static void __exit
 fini(void)
 {
-	ipt_unregister_match(&condition_match);
+	ip6t_unregister_match(&condition_match);
 	remove_proc_entry("ip6t_condition", proc_net);
 }