git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
net
/
ipv6
/
netfilter
/
ip6t_frag.c
diff --git
a/net/ipv6/netfilter/ip6t_frag.c
b/net/ipv6/netfilter/ip6t_frag.c
index
185f583
..
cd22eaa
100644
(file)
--- a/
net/ipv6/netfilter/ip6t_frag.c
+++ b/
net/ipv6/netfilter/ip6t_frag.c
@@
-43,6
+43,7
@@
static int
match(const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
match(const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
+ const struct xt_match *match,
const void *matchinfo,
int offset,
unsigned int protoff,
const void *matchinfo,
int offset,
unsigned int protoff,
@@
-121,41
+122,36
@@
match(const struct sk_buff *skb,
static int
checkentry(const char *tablename,
const void *ip,
static int
checkentry(const char *tablename,
const void *ip,
+ const struct xt_match *match,
void *matchinfo,
void *matchinfo,
- unsigned int matchinfosize,
unsigned int hook_mask)
{
const struct ip6t_frag *fraginfo = matchinfo;
unsigned int hook_mask)
{
const struct ip6t_frag *fraginfo = matchinfo;
- if (matchinfosize != IP6T_ALIGN(sizeof(struct ip6t_frag))) {
- DEBUGP("ip6t_frag: matchsize %u != %u\n",
- matchinfosize, IP6T_ALIGN(sizeof(struct ip6t_frag)));
- return 0;
- }
if (fraginfo->invflags & ~IP6T_FRAG_INV_MASK) {
DEBUGP("ip6t_frag: unknown flags %X\n", fraginfo->invflags);
return 0;
}
if (fraginfo->invflags & ~IP6T_FRAG_INV_MASK) {
DEBUGP("ip6t_frag: unknown flags %X\n", fraginfo->invflags);
return 0;
}
-
return 1;
}
static struct ip6t_match frag_match = {
.name = "frag",
return 1;
}
static struct ip6t_match frag_match = {
.name = "frag",
- .match = &match,
- .checkentry = &checkentry,
+ .match = match,
+ .matchsize = sizeof(struct ip6t_frag),
+ .checkentry = checkentry,
.me = THIS_MODULE,
};
.me = THIS_MODULE,
};
-static int __init init(void)
+static int __init i
p6t_frag_i
nit(void)
{
return ip6t_register_match(&frag_match);
}
{
return ip6t_register_match(&frag_match);
}
-static void __exit
cleanup
(void)
+static void __exit
ip6t_frag_fini
(void)
{
ip6t_unregister_match(&frag_match);
}
{
ip6t_unregister_match(&frag_match);
}
-module_init(init);
-module_exit(
cleanup
);
+module_init(i
p6t_frag_i
nit);
+module_exit(
ip6t_frag_fini
);