[PATCH 5/7] ipt_ipp2p compile fix for 2.6.21

[Jan Engelhardt <jengelh@xxxxxxxxxxxxxxx>]

Fix compilation of ipt_ipp2p.

Signed-off-by: Jan Engelhardt <jengelh@xxxxxx>

Index: linux-2.6.21-rc5/net/ipv4/netfilter/ipt_ipp2p.c
===================================================================
--- linux-2.6.21-rc5.orig/net/ipv4/netfilter/ipt_ipp2p.c
+++ linux-2.6.21-rc5/net/ipv4/netfilter/ipt_ipp2p.c
@@ -831,7 +831,6 @@ checkentry(const char *tablename,
             const struct xt_match *match,
 #endif
 	    void *matchinfo,
-	    unsigned int matchsize,
 	    unsigned int hook_mask)
 {
         /* Must specify -p tcp */
@@ -845,36 +844,27 @@ checkentry(const char *tablename,
 
 
 
-static struct ipt_match ipp2p_match = { 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-	{ NULL, NULL }, 
-	"ipp2p", 
-	&match, 
-	&checkentry, 
-	NULL, 
-	THIS_MODULE
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+static struct xt_match ipp2p_match = { 
 	.name		= "ipp2p",
 	.match		= &match,
+	.family		= AF_INET,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
 	.matchsize	= sizeof(struct ipt_p2p_info),
 #endif
 	.checkentry	= &checkentry,
 	.me		= THIS_MODULE,
-#endif
 };
 
 
 static int __init init(void)
 {
     printk(KERN_INFO "IPP2P v%s loading\n", IPP2P_VERSION);
-    return ipt_register_match(&ipp2p_match);
+    return xt_register_match(&ipp2p_match);
 }
 	
 static void __exit fini(void)
 {
-    ipt_unregister_match(&ipp2p_match);
+    xt_unregister_match(&ipp2p_match);
     printk(KERN_INFO "IPP2P v%s unloaded\n", IPP2P_VERSION);    
 }