aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-02-12 14:14:43 -0500
committerDavid S. Miller <davem@davemloft.net>2007-02-12 14:14:43 -0500
commit891350c9d168a7d58a193a67a1d107c23f9c2eb1 (patch)
tree1a4f8c2e05c278187ac481a10aa1790e2530061d
parentfe3eb20c1ace69e42e6ebf2afd2a904b2ae85cde (diff)
[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: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/netfilter/xt_CLASSIFY.c8
-rw-r--r--net/netfilter/xt_mac.c7
2 files changed, 9 insertions, 6 deletions
diff --git a/net/netfilter/xt_CLASSIFY.c b/net/netfilter/xt_CLASSIFY.c
index 195e92990da7..4007bbefc8ab 100644
--- a/net/netfilter/xt_CLASSIFY.c
+++ b/net/netfilter/xt_CLASSIFY.c
@@ -15,6 +15,8 @@
15#include <linux/ip.h> 15#include <linux/ip.h>
16#include <net/checksum.h> 16#include <net/checksum.h>
17 17
18#include <linux/netfilter_ipv4.h>
19#include <linux/netfilter_ipv6.h>
18#include <linux/netfilter/x_tables.h> 20#include <linux/netfilter/x_tables.h>
19#include <linux/netfilter/xt_CLASSIFY.h> 21#include <linux/netfilter/xt_CLASSIFY.h>
20 22
@@ -55,9 +57,9 @@ static struct xt_target xt_classify_target[] = {
55 .target = target, 57 .target = target,
56 .targetsize = sizeof(struct xt_classify_target_info), 58 .targetsize = sizeof(struct xt_classify_target_info),
57 .table = "mangle", 59 .table = "mangle",
58 .hooks = (1 << NF_IP_LOCAL_OUT) | 60 .hooks = (1 << NF_IP6_LOCAL_OUT) |
59 (1 << NF_IP_FORWARD) | 61 (1 << NF_IP6_FORWARD) |
60 (1 << NF_IP_POST_ROUTING), 62 (1 << NF_IP6_POST_ROUTING),
61 .me = THIS_MODULE, 63 .me = THIS_MODULE,
62 }, 64 },
63}; 65};
diff --git a/net/netfilter/xt_mac.c b/net/netfilter/xt_mac.c
index 425fc21e31f5..d430d90d7b26 100644
--- a/net/netfilter/xt_mac.c
+++ b/net/netfilter/xt_mac.c
@@ -14,6 +14,7 @@
14#include <linux/etherdevice.h> 14#include <linux/etherdevice.h>
15 15
16#include <linux/netfilter_ipv4.h> 16#include <linux/netfilter_ipv4.h>
17#include <linux/netfilter_ipv6.h>
17#include <linux/netfilter/xt_mac.h> 18#include <linux/netfilter/xt_mac.h>
18#include <linux/netfilter/x_tables.h> 19#include <linux/netfilter/x_tables.h>
19 20
@@ -59,9 +60,9 @@ static struct xt_match xt_mac_match[] = {
59 .family = AF_INET6, 60 .family = AF_INET6,
60 .match = match, 61 .match = match,
61 .matchsize = sizeof(struct xt_mac_info), 62 .matchsize = sizeof(struct xt_mac_info),
62 .hooks = (1 << NF_IP_PRE_ROUTING) | 63 .hooks = (1 << NF_IP6_PRE_ROUTING) |
63 (1 << NF_IP_LOCAL_IN) | 64 (1 << NF_IP6_LOCAL_IN) |
64 (1 << NF_IP_FORWARD), 65 (1 << NF_IP6_FORWARD),
65 .me = THIS_MODULE, 66 .me = THIS_MODULE,
66 }, 67 },
67}; 68};