[netfilter-cvslog] r3624 - in trunk/patch-o-matic-ng/time: . linux-2.6/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-02-01 11:48:03 +0100 (Tue, 01 Feb 2005)
New Revision: 3624

Added:
   trunk/patch-o-matic-ng/time/linux-2.6/
Modified:
   trunk/patch-o-matic-ng/time/linux-2.6/net/ipv4/netfilter/ipt_time.c
Log:
- Add a new 2.6 branch of the match (Harald Welte)
- Use C99 initializers to allow for new match revision field.
- Update function parameter list to match the corresponding function prototype.
Signed-off-by: Bill Rugolsky <brugolsky at telemetry-investments.com>


Copied: trunk/patch-o-matic-ng/time/linux-2.6 (from rev 3619, trunk/patch-o-matic-ng/time/linux)

Modified: trunk/patch-o-matic-ng/time/linux-2.6/net/ipv4/netfilter/ipt_time.c
===================================================================
--- trunk/patch-o-matic-ng/time/linux/net/ipv4/netfilter/ipt_time.c	2005-01-30 19:33:42 UTC (rev 3619)
+++ trunk/patch-o-matic-ng/time/linux-2.6/net/ipv4/netfilter/ipt_time.c	2005-02-01 10:48:03 UTC (rev 3624)
@@ -48,8 +48,6 @@
       const struct net_device *out,
       const void *matchinfo,
       int offset,
-      const void *hdr,
-      u_int16_t datalen,
       int *hotdrop)
 {
 	const struct ipt_time_info *info = matchinfo;   /* match info for rule */
@@ -124,8 +122,12 @@
 	return 1;
 }
 
-static struct ipt_match time_match
-= { { NULL, NULL }, "time", &match, &checkentry, NULL, THIS_MODULE };
+static struct ipt_match time_match = {
+	.name = "time",
+	.match = &match,
+	.checkentry = &checkentry,
+	.me = THIS_MODULE
+};
 
 static int __init init(void)
 {