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]: Introduce NF_INET_ hook values
[safe/jmp/linux-2.6]
/
net
/
ipv6
/
netfilter
/
ip6table_raw.c
diff --git
a/net/ipv6/netfilter/ip6table_raw.c
b/net/ipv6/netfilter/ip6table_raw.c
index
8f7109f
..
4fecd8d
100644
(file)
--- a/
net/ipv6/netfilter/ip6table_raw.c
+++ b/
net/ipv6/netfilter/ip6table_raw.c
@@
-6,7
+6,7
@@
#include <linux/module.h>
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/module.h>
#include <linux/netfilter_ipv6/ip6_tables.h>
-#define RAW_VALID_HOOKS ((1 << NF_I
P6_PRE_ROUTING) | (1 << NF_IP6
_LOCAL_OUT))
+#define RAW_VALID_HOOKS ((1 << NF_I
NET_PRE_ROUTING) | (1 << NF_INET
_LOCAL_OUT))
static struct
{
static struct
{
@@
-20,12
+20,12
@@
static struct
.num_entries = 3,
.size = sizeof(struct ip6t_standard) * 2 + sizeof(struct ip6t_error),
.hook_entry = {
.num_entries = 3,
.size = sizeof(struct ip6t_standard) * 2 + sizeof(struct ip6t_error),
.hook_entry = {
- [NF_I
P6
_PRE_ROUTING] = 0,
- [NF_I
P6
_LOCAL_OUT] = sizeof(struct ip6t_standard)
+ [NF_I
NET
_PRE_ROUTING] = 0,
+ [NF_I
NET
_LOCAL_OUT] = sizeof(struct ip6t_standard)
},
.underflow = {
},
.underflow = {
- [NF_I
P6
_PRE_ROUTING] = 0,
- [NF_I
P6
_LOCAL_OUT] = sizeof(struct ip6t_standard)
+ [NF_I
NET
_PRE_ROUTING] = 0,
+ [NF_I
NET
_LOCAL_OUT] = sizeof(struct ip6t_standard)
},
},
.entries = {
},
},
.entries = {
@@
-58,14
+58,14
@@
static struct nf_hook_ops ip6t_ops[] = {
{
.hook = ip6t_hook,
.pf = PF_INET6,
{
.hook = ip6t_hook,
.pf = PF_INET6,
- .hooknum = NF_I
P6
_PRE_ROUTING,
+ .hooknum = NF_I
NET
_PRE_ROUTING,
.priority = NF_IP6_PRI_FIRST,
.owner = THIS_MODULE,
},
{
.hook = ip6t_hook,
.pf = PF_INET6,
.priority = NF_IP6_PRI_FIRST,
.owner = THIS_MODULE,
},
{
.hook = ip6t_hook,
.pf = PF_INET6,
- .hooknum = NF_I
P6
_LOCAL_OUT,
+ .hooknum = NF_I
NET
_LOCAL_OUT,
.priority = NF_IP6_PRI_FIRST,
.owner = THIS_MODULE,
},
.priority = NF_IP6_PRI_FIRST,
.owner = THIS_MODULE,
},