From 891b3ecf021027c925fa3d72ecb8eb68cf9ba6dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?UTF-8?q?=E6=98=8E?= Date: Thu, 17 Jan 2013 12:53:32 +0000 Subject: [PATCH] --- yaml --- r: 351439 b: refs/heads/master c: c440f1609b6516029ac5286e00fb86b3a11acd8e h: refs/heads/master i: 351437: b9b0d3aea36d30d818cd8e6658110763f842d2f5 351435: 257d822f8f4d945ae3ef6f0d4cf198ab8c673589 351431: 553e711408cd8bdbfc502fc81fd9b272ccae0274 351423: 7bbeb2a4d98bb54212f9feac4cd2a3233ee2303a v: v3 --- [refs] | 2 +- trunk/net/ipv6/route.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1648a0f25d1c..7aeb27fae9ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac3175fe7a5788d40b067b76c27f2943cd0be2d7 +refs/heads/master: c440f1609b6516029ac5286e00fb86b3a11acd8e diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c index d82eb1f24b25..2839381116ea 100644 --- a/trunk/net/ipv6/route.c +++ b/trunk/net/ipv6/route.c @@ -925,7 +925,7 @@ static struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, dst_hold(&rt->dst); read_unlock_bh(&table->tb6_lock); - if (!rt->n && !(rt->rt6i_flags & RTF_NONEXTHOP)) + if (!(rt->rt6i_flags & (RTF_NONEXTHOP | RTF_GATEWAY))) nrt = rt6_alloc_cow(rt, &fl6->daddr, &fl6->saddr); else if (!(rt->dst.flags & DST_HOST)) nrt = rt6_alloc_clone(rt, &fl6->daddr);