From: David S. Miller <davem@sunset.davemloft.net>
Date: Fri, 25 Aug 2006 23:07:48 +0000 (-0700)
Subject: [IPV6]: Fix build with fwmark disabled.
X-Git-Tag: v2.6.19-rc1~1272^2~117
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=267935b197d2a6e6924f9de2841f0470bfe63acd;p=linux-2.6

[IPV6]: Fix build with fwmark disabled.

Based upon a patch by Brian Haley.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 649350bd92..d83844d949 100644
--- a/net/ipv6/route.c
+++ b/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,
 			},
 		},