diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-08-25 19:07:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 18:18:09 -0400 |
| commit | 267935b197d2a6e6924f9de2841f0470bfe63acd (patch) | |
| tree | de297ef5f0e597735e498edcfd7f7301404748a1 /net/ipv6/route.c | |
| parent | cd9d742622fbc2190221e0b2aca80596bfd17733 (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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 649350bd9299..d83844d9499b 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
| @@ -703,7 +703,9 @@ void ip6_route_input(struct sk_buff *skb) | |||
| 703 | .ip6_u = { | 703 | .ip6_u = { |
| 704 | .daddr = iph->daddr, | 704 | .daddr = iph->daddr, |
| 705 | .saddr = iph->saddr, | 705 | .saddr = iph->saddr, |
| 706 | #ifdef CONFIG_IPV6_ROUTE_FWMARK | ||
| 706 | .fwmark = skb->nfmark, | 707 | .fwmark = skb->nfmark, |
| 708 | #endif | ||
| 707 | .flowlabel = (* (u32 *) iph)&IPV6_FLOWINFO_MASK, | 709 | .flowlabel = (* (u32 *) iph)&IPV6_FLOWINFO_MASK, |
| 708 | }, | 710 | }, |
| 709 | }, | 711 | }, |