NetFilter
[Top] [All Lists]

[PATCH 6/7] ipt_time compile fix for 2.6.21

To: Netfilter Mailing List <netfilter@lists.netfilter.org>
Subject: [PATCH 6/7] ipt_time compile fix for 2.6.21
From: Jan Engelhardt <jengelh@linux01.gwdg.de>
Date: Sat, 7 Apr 2007 20:50:22 +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_time.

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

Index: linux-2.6.21-rc5/net/ipv4/netfilter/ipt_time.c
===================================================================
--- linux-2.6.21-rc5.orig/net/ipv4/netfilter/ipt_time.c
+++ linux-2.6.21-rc5/net/ipv4/netfilter/ipt_time.c
@@ -97,7 +97,6 @@ checkentry(const char *tablename,
             const struct xt_match *match,
 #endif
            void *matchinfo,
-           unsigned int matchsize,
            unsigned int hook_mask)
 {
        struct ipt_time_info *info = matchinfo;   /* match info for rule */
@@ -127,9 +126,10 @@ checkentry(const char *tablename,
        return 1;
 }
 
-static struct ipt_match time_match = {
+static struct xt_match time_match = {
        .name           = "time",
        .match          = &match,
+       .family         = AF_INET,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
        .matchsize      = sizeof(struct ipt_time_info),
 #endif
@@ -140,12 +140,12 @@ static struct ipt_match time_match = {
 static int __init init(void)
 {
        printk("ipt_time loading\n");
-       return ipt_register_match(&time_match);
+       return xt_register_match(&time_match);
 }
 
 static void __exit fini(void)
 {
-       ipt_unregister_match(&time_match);
+       xt_unregister_match(&time_match);
        printk("ipt_time unloaded\n");
 }
 


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