NetFilter
[Top] [All Lists]

[PATCH 7/7] ipt_u32 compile fix for 2.6.21

To: Netfilter Mailing List <netfilter@lists.netfilter.org>
Subject: [PATCH 7/7] ipt_u32 compile fix for 2.6.21
From: Jan Engelhardt <jengelh@linux01.gwdg.de>
Date: Sat, 7 Apr 2007 20:50:33 +0200 (MEST)
Delivered-to: sp-com-lists@consult.net
Delivered-to: netfilter-list1@securepoint.com
In-reply-to: <Pine.LNX.4.61.0704072045320.22181@yvahk01.tjqt.qr>
List-archive: </pipermail/netfilter>
List-help: <mailto:netfilter-request@lists.netfilter.org?subject=help>
List-id: General discussion and user questions <netfilter.lists.netfilter.org>
List-post: <mailto:netfilter@lists.netfilter.org>
List-subscribe: <https://lists.netfilter.org/mailman/listinfo/netfilter>, <mailto:netfilter-request@lists.netfilter.org?subject=subscribe>
List-unsubscribe: <https://lists.netfilter.org/mailman/listinfo/netfilter>, <mailto:netfilter-request@lists.netfilter.org?subject=unsubscribe>
References: <8d158e1f0704070955x2bb50060ueb8d2c0b91acba00@mail.gmail.com> <Pine.LNX.4.61.0704072045320.22181@yvahk01.tjqt.qr>
Sender: netfilter-bounces@lists.netfilter.org
Fix compilation of ipt_u32.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/net/ipv4/netfilter/ipt_u32.c
===================================================================
--- linux-2.6.21-rc5.orig/net/ipv4/netfilter/ipt_u32.c
+++ linux-2.6.21-rc5/net/ipv4/netfilter/ipt_u32.c
@@ -201,35 +201,22 @@ match(const struct sk_buff *skb,
        return 1;
 }
 
-static int
-checkentry(const char *tablename,
-           const void *ip,
-           const struct xt_match *match,
-           void *matchinfo,
-           unsigned int matchsize,
-           unsigned int hook_mask)
-{
-       if (matchsize != IPT_ALIGN(sizeof(struct ipt_u32)))
-               return 0;
-       return 1;
-}
-
-static struct ipt_match u32_match = { 
+static struct xt_match u32_match = { 
        .name           = "u32",
+       .family         = AF_INET,
        .match          = &match,
        .matchsize      = sizeof(struct ipt_u32),
-       .checkentry     = &checkentry,
        .me             = THIS_MODULE
 };
 
 static int __init init(void)
 {
-       return ipt_register_match(&u32_match);
+       return xt_register_match(&u32_match);
 }
 
 static void __exit fini(void)
 {
-       ipt_unregister_match(&u32_match);
+       xt_unregister_match(&u32_match);
 }
 
 module_init(init);


<Prev in Thread] Current Thread [Next in Thread>