git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: x_tables: switch hotdrop to bool
[safe/jmp/linux-2.6]
/
net
/
ipv4
/
netfilter
/
ipt_tos.c
diff --git
a/net/ipv4/netfilter/ipt_tos.c
b/net/ipv4/netfilter/ipt_tos.c
index
5549c39
..
803ed4c
100644
(file)
--- a/
net/ipv4/netfilter/ipt_tos.c
+++ b/
net/ipv4/netfilter/ipt_tos.c
@@
-8,11
+8,12
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
+#include <linux/ip.h>
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/netfilter_ipv4/ipt_tos.h>
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/netfilter_ipv4/ipt_tos.h>
-#include <linux/netfilter
_ipv4/ip
_tables.h>
+#include <linux/netfilter
/x
_tables.h>
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("iptables TOS match module");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("iptables TOS match module");
@@
-25,15
+26,16
@@
match(const struct sk_buff *skb,
const void *matchinfo,
int offset,
unsigned int protoff,
const void *matchinfo,
int offset,
unsigned int protoff,
-
int
*hotdrop)
+
bool
*hotdrop)
{
const struct ipt_tos_info *info = matchinfo;
{
const struct ipt_tos_info *info = matchinfo;
- return (
skb->nh.iph
->tos == info->tos) ^ info->invert;
+ return (
ip_hdr(skb)
->tos == info->tos) ^ info->invert;
}
}
-static struct
ip
t_match tos_match = {
+static struct
x
t_match tos_match = {
.name = "tos",
.name = "tos",
+ .family = AF_INET,
.match = match,
.matchsize = sizeof(struct ipt_tos_info),
.me = THIS_MODULE,
.match = match,
.matchsize = sizeof(struct ipt_tos_info),
.me = THIS_MODULE,
@@
-41,12
+43,12
@@
static struct ipt_match tos_match = {
static int __init ipt_multiport_init(void)
{
static int __init ipt_multiport_init(void)
{
- return
ip
t_register_match(&tos_match);
+ return
x
t_register_match(&tos_match);
}
static void __exit ipt_multiport_fini(void)
{
}
static void __exit ipt_multiport_fini(void)
{
-
ip
t_unregister_match(&tos_match);
+
x
t_unregister_match(&tos_match);
}
module_init(ipt_multiport_init);
}
module_init(ipt_multiport_init);