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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
086a1bb
..
5549c39
100644
(file)
--- a/
net/ipv4/netfilter/ipt_tos.c
+++ b/
net/ipv4/netfilter/ipt_tos.c
@@
-21,8
+21,10
@@
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,
const void *matchinfo,
int offset,
+ unsigned int protoff,
int *hotdrop)
{
const struct ipt_tos_info *info = matchinfo;
int *hotdrop)
{
const struct ipt_tos_info *info = matchinfo;
@@
-30,35
+32,22
@@
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 struct ipt_ip *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,
- .
checkentry = &checkentry
,
+ .match = match,
+ .
matchsize = sizeof(struct ipt_tos_info)
,
.me = THIS_MODULE,
};
.me = THIS_MODULE,
};
-static int __init init(void)
+static int __init i
pt_multiport_i
nit(void)
{
return ipt_register_match(&tos_match);
}
{
return ipt_register_match(&tos_match);
}
-static void __exit fini(void)
+static void __exit
ipt_multiport_
fini(void)
{
ipt_unregister_match(&tos_match);
}
{
ipt_unregister_match(&tos_match);
}
-module_init(init);
-module_exit(fini);
+module_init(i
pt_multiport_i
nit);
+module_exit(
ipt_multiport_
fini);