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
/
arptable_filter.c
diff --git
a/net/ipv4/netfilter/arptable_filter.c
b/net/ipv4/netfilter/arptable_filter.c
index
70a07a6
..
d7c472f
100644
(file)
--- a/
net/ipv4/netfilter/arptable_filter.c
+++ b/
net/ipv4/netfilter/arptable_filter.c
@@
-141,11
+141,11
@@
static struct
static struct arpt_table packet_filter = {
.name = "filter",
static struct arpt_table packet_filter = {
.name = "filter",
- .table = &initial_table.repl,
.valid_hooks = FILTER_VALID_HOOKS,
.lock = RW_LOCK_UNLOCKED,
.private = NULL,
.me = THIS_MODULE,
.valid_hooks = FILTER_VALID_HOOKS,
.lock = RW_LOCK_UNLOCKED,
.private = NULL,
.me = THIS_MODULE,
+ .af = NF_ARP,
};
/* The work comes in here from netfilter.c */
};
/* The work comes in here from netfilter.c */
@@
-179,37
+179,30
@@
static struct nf_hook_ops arpt_ops[] = {
},
};
},
};
-static int __init init(void)
+static int __init
arptable_filter_
init(void)
{
{
- int ret
, i
;
+ int ret;
/* Register table */
/* Register table */
- ret = arpt_register_table(&packet_filter);
+ ret = arpt_register_table(&packet_filter
, &initial_table.repl
);
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- for (i = 0; i < ARRAY_SIZE(arpt_ops); i++)
-
if ((ret = nf_register_hook(&arpt_ops[i]))
< 0)
-
goto cleanup_hooks
;
+ ret = nf_register_hooks(arpt_ops, ARRAY_SIZE(arpt_ops));
+
if (ret
< 0)
+
goto cleanup_table
;
return ret;
return ret;
-cleanup_hooks:
- while (--i >= 0)
- nf_unregister_hook(&arpt_ops[i]);
-
+cleanup_table:
arpt_unregister_table(&packet_filter);
return ret;
}
arpt_unregister_table(&packet_filter);
return ret;
}
-static void __exit fini(void)
+static void __exit
arptable_filter_
fini(void)
{
{
- unsigned int i;
-
- for (i = 0; i < ARRAY_SIZE(arpt_ops); i++)
- nf_unregister_hook(&arpt_ops[i]);
-
+ nf_unregister_hooks(arpt_ops, ARRAY_SIZE(arpt_ops));
arpt_unregister_table(&packet_filter);
}
arpt_unregister_table(&packet_filter);
}
-module_init(init);
-module_exit(fini);
+module_init(
arptable_filter_
init);
+module_exit(
arptable_filter_
fini);