diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-08-25 16:07:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 15:18:09 -0700 |
| commit | 267935b197d2a6e6924f9de2841f0470bfe63acd (patch) | |
| tree | de297ef5f0e597735e498edcfd7f7301404748a1 /net/ipv6 | |
| parent | cd9d742622fbc2190221e0b2aca80596bfd17733 (diff) | |
| download | kernel_goldelico_gta04-267935b197d2a6e6924f9de2841f0470bfe63acd.zip kernel_goldelico_gta04-267935b197d2a6e6924f9de2841f0470bfe63acd.tar.gz kernel_goldelico_gta04-267935b197d2a6e6924f9de2841f0470bfe63acd.tar.bz2 | |
[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')
| -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 649350b..d83844d 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, }, }, |