---

yaml --- r: 34627 b: refs/heads/master c: 267935b h: refs/heads/master i: 34625: d470f74 34623: 6c79798 v: v3
git-mirror · Sep 22, 2006 · a966e54 · a966e54
1 parent 4f57f63
commit a966e54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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,
 			},
 		},