[netfilter-cvslog] r6569 -
trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter
kaber at netfilter.org
kaber at netfilter.org
Wed Mar 29 11:06:30 CEST 2006
Author: kaber at netfilter.org
Date: 2006-03-29 11:06:23 +0200 (Wed, 29 Mar 2006)
New Revision: 6569
Modified:
trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ipt_SET.c
trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ipt_set.c
Log:
[POM-NG 7/10] Fix the set extension for 2.6.16 kernels
This patch removes warnings when the set extension is used in 2.6.16 kernels
Signed-off-by: Krzysztof Piotr Oledzki <ole at ans.pl>
Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ipt_SET.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ipt_SET.c 2006-03-29 09:06:04 UTC (rev 6568)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ipt_SET.c 2006-03-29 09:06:23 UTC (rev 6569)
@@ -48,7 +48,7 @@
static int
checkentry(const char *tablename,
- const struct ipt_entry *e,
+ const void *e,
void *targinfo,
unsigned int targinfosize, unsigned int hook_mask)
{
Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ipt_set.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ipt_set.c 2006-03-29 09:06:04 UTC (rev 6568)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ipt_set.c 2006-03-29 09:06:23 UTC (rev 6569)
@@ -34,6 +34,7 @@
const struct net_device *out,
const void *matchinfo,
int offset,
+ unsigned int protoff,
int *hotdrop)
{
const struct ipt_set_info_match *info = matchinfo;
@@ -45,7 +46,7 @@
static int
checkentry(const char *tablename,
- const struct ipt_ip *ip,
+ const void *ip,
void *matchinfo,
unsigned int matchsize,
unsigned int hook_mask)
More information about the netfilter-cvslog
mailing list