aboutsummaryrefslogtreecommitdiff
path: root/net/ipv6/route.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-08-25 16:07:48 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 15:18:09 -0700
commit267935b197d2a6e6924f9de2841f0470bfe63acd (patch)
treede297ef5f0e597735e498edcfd7f7301404748a1 /net/ipv6/route.c
parentcd9d742622fbc2190221e0b2aca80596bfd17733 (diff)
[IPV6]: Fix build with fwmark disabled.
Based upon a patch by Brian Haley. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r--net/ipv6/route.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 649350bd929..d83844d9499 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,
},
},