Sfoglia il codice sorgente

[IPV6]: Fix build with fwmark disabled.

Based upon a patch by Brian Haley.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 19 anni fa
parent
commit
267935b197
1 ha cambiato i file con 2 aggiunte e 0 eliminazioni
  1. 2 0
      net/ipv6/route.c

+ 2 - 0
net/ipv6/route.c

@@ -703,7 +703,9 @@ void ip6_route_input(struct sk_buff *skb)
 			.ip6_u = {
 			.ip6_u = {
 				.daddr = iph->daddr,
 				.daddr = iph->daddr,
 				.saddr = iph->saddr,
 				.saddr = iph->saddr,
+#ifdef CONFIG_IPV6_ROUTE_FWMARK
 				.fwmark = skb->nfmark,
 				.fwmark = skb->nfmark,
+#endif
 				.flowlabel = (* (u32 *) iph)&IPV6_FLOWINFO_MASK,
 				.flowlabel = (* (u32 *) iph)&IPV6_FLOWINFO_MASK,
 			},
 			},
 		},
 		},