diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2013-02-18 13:25:42 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-02-18 13:25:42 -0500 |
| commit | 4d2803479e70664766efefc4fe7f0dd8c29fd1ed (patch) | |
| tree | 5839558eeda32f86b042740ea1c2cceb65b9ba5c /net/ipv6/route.c | |
| parent | 65d2b279b50daefbece2c9b5fdd90eee9f0be503 (diff) | |
| parent | 54ea5b40f067cf098cac639973c6628c6944cfb2 (diff) | |
| download | linux-rt-4d2803479e70664766efefc4fe7f0dd8c29fd1ed.tar.gz | |
Merge tag 'v3.0.64' into v3.0-rt
This is the 3.0.64 stable release
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 550fec3c9abf..d5b5f56e4004 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -802,7 +802,8 @@ restart: dst_hold(&rt->dst); read_unlock_bh(&table->tb6_lock); - if (!dst_get_neighbour_raw(&rt->dst) && !(rt->rt6i_flags & RTF_NONEXTHOP)) + if (!dst_get_neighbour_raw(&rt->dst) && + !(rt->rt6i_flags & (RTF_NONEXTHOP | RTF_LOCAL))) nrt = rt6_alloc_cow(rt, &fl6->daddr, &fl6->saddr); else if (!(rt->dst.flags & DST_HOST)) nrt = rt6_alloc_clone(rt, &fl6->daddr); |