From a966e5426ea2722170e262c947ffa7d9c799af3e Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Fri, 25 Aug 2006 16:07:48 -0700
Subject: [PATCH] --- yaml --- r: 34627 b: refs/heads/master c:
 267935b197d2a6e6924f9de2841f0470bfe63acd h: refs/heads/master i:   34625:
 d470f741d22675563af2520b58965be03f304604   34623:
 6c797982e0d290263172caff3585ef2671b63cb3 v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/route.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7a9a9602dfd2..d8e0d0a567fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd9d742622fbc2190221e0b2aca80596bfd17733
+refs/heads/master: 267935b197d2a6e6924f9de2841f0470bfe63acd
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 649350bd9299..d83844d9499b 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -703,7 +703,9 @@ void ip6_route_input(struct sk_buff *skb)
 			.ip6_u = {
 				.daddr = iph->daddr,
 				.saddr = iph->saddr,
+#ifdef CONFIG_IPV6_ROUTE_FWMARK
 				.fwmark = skb->nfmark,
+#endif
 				.flowlabel = (* (u32 *) iph)&IPV6_FLOWINFO_MASK,
 			},
 		},