| commit | 267935b197d2a6e6924f9de2841f0470bfe63acd | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@sunset.davemloft.net> | Fri Aug 25 16:07:48 2006 -0700 |
| committer | David S. Miller <davem@sunset.davemloft.net> | Fri Sep 22 15:18:09 2006 -0700 |
| tree | de297ef5f0e597735e498edcfd7f7301404748a1 | |
| parent | cd9d742622fbc2190221e0b2aca80596bfd17733 [diff] [blame] |
[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 649350b..d83844d 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c
@@ -703,7 +703,9 @@ .ip6_u = { .daddr = iph->daddr, .saddr = iph->saddr, +#ifdef CONFIG_IPV6_ROUTE_FWMARK .fwmark = skb->nfmark, +#endif .flowlabel = (* (u32 *) iph)&IPV6_FLOWINFO_MASK, }, },