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
/
ipv6
/
netfilter
/
ip6table_filter.c
diff --git
a/net/ipv6/netfilter/ip6table_filter.c
b/net/ipv6/netfilter/ip6table_filter.c
index
4c00286
..
60976c0
100644
(file)
--- a/
net/ipv6/netfilter/ip6table_filter.c
+++ b/
net/ipv6/netfilter/ip6table_filter.c
@@
-97,6
+97,7
@@
static struct ip6t_table packet_filter = {
.valid_hooks = FILTER_VALID_HOOKS,
.lock = RW_LOCK_UNLOCKED,
.me = THIS_MODULE,
.valid_hooks = FILTER_VALID_HOOKS,
.lock = RW_LOCK_UNLOCKED,
.me = THIS_MODULE,
+ .af = AF_INET6,
};
/* The work comes in here from netfilter.c. */
};
/* The work comes in here from netfilter.c. */
@@
-158,7
+159,7
@@
static struct nf_hook_ops ip6t_ops[] = {
static int forward = NF_ACCEPT;
module_param(forward, bool, 0000);
static int forward = NF_ACCEPT;
module_param(forward, bool, 0000);
-static int __init init(void)
+static int __init i
p6table_filter_i
nit(void)
{
int ret;
{
int ret;
@@
-176,39
+177,22
@@
static int __init init(void)
return ret;
/* Register hooks */
return ret;
/* Register hooks */
- ret = nf_register_hook
(&ip6t_ops[0]
);
+ ret = nf_register_hook
s(ip6t_ops, ARRAY_SIZE(ip6t_ops)
);
if (ret < 0)
goto cleanup_table;
if (ret < 0)
goto cleanup_table;
- ret = nf_register_hook(&ip6t_ops[1]);
- if (ret < 0)
- goto cleanup_hook0;
-
- ret = nf_register_hook(&ip6t_ops[2]);
- if (ret < 0)
- goto cleanup_hook1;
-
return ret;
return ret;
- cleanup_hook1:
- nf_unregister_hook(&ip6t_ops[1]);
- cleanup_hook0:
- nf_unregister_hook(&ip6t_ops[0]);
cleanup_table:
ip6t_unregister_table(&packet_filter);
cleanup_table:
ip6t_unregister_table(&packet_filter);
-
return ret;
}
return ret;
}
-static void __exit fini(void)
+static void __exit
ip6table_filter_
fini(void)
{
{
- unsigned int i;
-
- for (i = 0; i < sizeof(ip6t_ops)/sizeof(struct nf_hook_ops); i++)
- nf_unregister_hook(&ip6t_ops[i]);
-
+ nf_unregister_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
ip6t_unregister_table(&packet_filter);
}
ip6t_unregister_table(&packet_filter);
}
-module_init(init);
-module_exit(fini);
+module_init(i
p6table_filter_i
nit);
+module_exit(
ip6table_filter_
fini);