Commit 891350c9 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller

[NETFILTER]: xt_mac/xt_CLASSIFY: use IPv6 hook names for IPv6 registration

Use NF_IP6_ instead of NF_IP_. The values are identical, this is merely
cleanup.
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe3eb20c
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#include <linux/ip.h> #include <linux/ip.h>
#include <net/checksum.h> #include <net/checksum.h>
#include <linux/netfilter_ipv4.h>
#include <linux/netfilter_ipv6.h>
#include <linux/netfilter/x_tables.h> #include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_CLASSIFY.h> #include <linux/netfilter/xt_CLASSIFY.h>
...@@ -55,9 +57,9 @@ static struct xt_target xt_classify_target[] = { ...@@ -55,9 +57,9 @@ static struct xt_target xt_classify_target[] = {
.target = target, .target = target,
.targetsize = sizeof(struct xt_classify_target_info), .targetsize = sizeof(struct xt_classify_target_info),
.table = "mangle", .table = "mangle",
.hooks = (1 << NF_IP_LOCAL_OUT) | .hooks = (1 << NF_IP6_LOCAL_OUT) |
(1 << NF_IP_FORWARD) | (1 << NF_IP6_FORWARD) |
(1 << NF_IP_POST_ROUTING), (1 << NF_IP6_POST_ROUTING),
.me = THIS_MODULE, .me = THIS_MODULE,
}, },
}; };
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv4.h>
#include <linux/netfilter_ipv6.h>
#include <linux/netfilter/xt_mac.h> #include <linux/netfilter/xt_mac.h>
#include <linux/netfilter/x_tables.h> #include <linux/netfilter/x_tables.h>
...@@ -59,9 +60,9 @@ static struct xt_match xt_mac_match[] = { ...@@ -59,9 +60,9 @@ static struct xt_match xt_mac_match[] = {
.family = AF_INET6, .family = AF_INET6,
.match = match, .match = match,
.matchsize = sizeof(struct xt_mac_info), .matchsize = sizeof(struct xt_mac_info),
.hooks = (1 << NF_IP_PRE_ROUTING) | .hooks = (1 << NF_IP6_PRE_ROUTING) |
(1 << NF_IP_LOCAL_IN) | (1 << NF_IP6_LOCAL_IN) |
(1 << NF_IP_FORWARD), (1 << NF_IP6_FORWARD),
.me = THIS_MODULE, .me = THIS_MODULE,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment