[netfilter-cvslog] r4038 - in trunk/patch-o-matic-ng/patchlets/expire: . linux-2.6.10/net/ipv6/netfilter

laforge at netfilter.org laforge at netfilter.org
Mon Jun 27 15:41:54 CEST 2005


Author: laforge at netfilter.org
Date: 2005-06-27 15:41:54 +0200 (Mon, 27 Jun 2005)
New Revision: 4038

Added:
   trunk/patch-o-matic-ng/patchlets/expire/linux-2.6.10/
Modified:
   trunk/patch-o-matic-ng/patchlets/expire/linux-2.6.10/net/ipv6/netfilter/ip6t_expire.c
Log:
make 2.6.10 branch for latest api changes


Copied: trunk/patch-o-matic-ng/patchlets/expire/linux-2.6.10 (from rev 4023, trunk/patch-o-matic-ng/patchlets/expire/linux-2.6)

Modified: trunk/patch-o-matic-ng/patchlets/expire/linux-2.6.10/net/ipv6/netfilter/ip6t_expire.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/expire/linux-2.6/net/ipv6/netfilter/ip6t_expire.c	2005-06-27 09:18:41 UTC (rev 4023)
+++ trunk/patch-o-matic-ng/patchlets/expire/linux-2.6.10/net/ipv6/netfilter/ip6t_expire.c	2005-06-27 13:41:54 UTC (rev 4038)
@@ -47,7 +47,7 @@
 
 static int ip6t_exp_match(const struct sk_buff *,
 		const struct net_device *, const struct net_device *,
-		const void *, int, const void *, u_int16_t, int *);
+		const void *, int, unsigned int, int *);
 static int ip6t_exp_checkentry(const char *, const struct ip6t_ip6 *,
 		void *, unsigned int, unsigned int);
 static int ip6t_exp_add_table(const char *);
@@ -154,7 +154,7 @@
 ip6t_exp_match(const struct sk_buff *skb,
 		const struct net_device *in, const struct net_device *out,
 		const void *matchinfo, int offset,
-		const void *header, u_int16_t len, int *hotdrop)
+		unsigned int protoff, int *hotdrop)
 {
 	const struct ip6t_exp_info *info = matchinfo;
 




More information about the netfilter-cvslog mailing list