projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cd9d742)
[IPV6]: Fix build with fwmark disabled.
authorDavid S. Miller <davem@sunset.davemloft.net>
Fri, 25 Aug 2006 23:07:48 +0000 (16:07 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 22 Sep 2006 22:18:09 +0000 (15:18 -0700)
Based upon a patch by Brian Haley.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/route.c patch | blob | blame | history

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 649350bd9299932ad4bdeddb34c4ac0cdd390b4a..d83844d9499bf487dfda81aa8a80506959b478e8 100644 (file)
--- 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,
                        },
                },