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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
ipv4
/
netfilter
/
ipt_tos.c
diff --git
a/net/ipv4/netfilter/ipt_tos.c
b/net/ipv4/netfilter/ipt_tos.c
index
5549c39
..
9ab765e
100644
(file)
--- a/
net/ipv4/netfilter/ipt_tos.c
+++ b/
net/ipv4/netfilter/ipt_tos.c
@@
-21,7
+21,6
@@
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,
@@
-32,22
+31,35
@@
match(const struct sk_buff *skb,
return (skb->nh.iph->tos == info->tos) ^ info->invert;
}
return (skb->nh.iph->tos == info->tos) ^ info->invert;
}
+static int
+checkentry(const char *tablename,
+ const void *ip,
+ void *matchinfo,
+ unsigned int matchsize,
+ unsigned int hook_mask)
+{
+ if (matchsize != IPT_ALIGN(sizeof(struct ipt_tos_info)))
+ return 0;
+
+ return 1;
+}
+
static struct ipt_match tos_match = {
.name = "tos",
static struct ipt_match tos_match = {
.name = "tos",
- .match = match,
- .
matchsize = sizeof(struct ipt_tos_info)
,
+ .match =
&
match,
+ .
checkentry = &checkentry
,
.me = THIS_MODULE,
};
.me = THIS_MODULE,
};
-static int __init i
pt_multiport_i
nit(void)
+static int __init init(void)
{
return ipt_register_match(&tos_match);
}
{
return ipt_register_match(&tos_match);
}
-static void __exit
ipt_multiport_
fini(void)
+static void __exit fini(void)
{
ipt_unregister_match(&tos_match);
}
{
ipt_unregister_match(&tos_match);
}
-module_init(i
pt_multiport_i
nit);
-module_exit(
ipt_multiport_
fini);
+module_init(init);
+module_exit(fini);