From fe07a1e8a512f6bf75ab729bea01c5673e054be6 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Mon, 12 Feb 2007 11:14:43 -0800
Subject: [PATCH] --- yaml --- r: 48113 b: refs/heads/master c:
 891350c9d168a7d58a193a67a1d107c23f9c2eb1 h: refs/heads/master i:   48111:
 8e778f02fb5fc3cdc8328855f909ae5b9b50a180 v: v3

---
 [refs]                            | 2 +-
 trunk/net/netfilter/xt_CLASSIFY.c | 8 +++++---
 trunk/net/netfilter/xt_mac.c      | 7 ++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b8c6ba2784c9..1d7864b67e7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe3eb20c1ace69e42e6ebf2afd2a904b2ae85cde
+refs/heads/master: 891350c9d168a7d58a193a67a1d107c23f9c2eb1
diff --git a/trunk/net/netfilter/xt_CLASSIFY.c b/trunk/net/netfilter/xt_CLASSIFY.c
index 195e92990da7..4007bbefc8ab 100644
--- a/trunk/net/netfilter/xt_CLASSIFY.c
+++ b/trunk/net/netfilter/xt_CLASSIFY.c
@@ -15,6 +15,8 @@
 #include <linux/ip.h>
 #include <net/checksum.h>
 
+#include <linux/netfilter_ipv4.h>
+#include <linux/netfilter_ipv6.h>
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_CLASSIFY.h>
 
@@ -55,9 +57,9 @@ static struct xt_target xt_classify_target[] = {
 		.target 	= target,
 		.targetsize	= sizeof(struct xt_classify_target_info),
 		.table		= "mangle",
-		.hooks		= (1 << NF_IP_LOCAL_OUT) |
-				  (1 << NF_IP_FORWARD) |
-			          (1 << NF_IP_POST_ROUTING),
+		.hooks		= (1 << NF_IP6_LOCAL_OUT) |
+				  (1 << NF_IP6_FORWARD) |
+			          (1 << NF_IP6_POST_ROUTING),
 		.me 		= THIS_MODULE,
 	},
 };
diff --git a/trunk/net/netfilter/xt_mac.c b/trunk/net/netfilter/xt_mac.c
index 425fc21e31f5..d430d90d7b26 100644
--- a/trunk/net/netfilter/xt_mac.c
+++ b/trunk/net/netfilter/xt_mac.c
@@ -14,6 +14,7 @@
 #include <linux/etherdevice.h>
 
 #include <linux/netfilter_ipv4.h>
+#include <linux/netfilter_ipv6.h>
 #include <linux/netfilter/xt_mac.h>
 #include <linux/netfilter/x_tables.h>
 
@@ -59,9 +60,9 @@ static struct xt_match xt_mac_match[] = {
 		.family		= AF_INET6,
 		.match		= match,
 		.matchsize	= sizeof(struct xt_mac_info),
-		.hooks		= (1 << NF_IP_PRE_ROUTING) |
-				  (1 << NF_IP_LOCAL_IN) |
-				  (1 << NF_IP_FORWARD),
+		.hooks		= (1 << NF_IP6_PRE_ROUTING) |
+				  (1 << NF_IP6_LOCAL_IN) |
+				  (1 << NF_IP6_FORWARD),
 		.me		= THIS_MODULE,
 	},
 };