|
@@ -977,7 +977,7 @@ redo_rt6_select:
|
|
|
|
|
|
if (!(rt->rt6i_flags & (RTF_NONEXTHOP | RTF_GATEWAY)))
|
|
if (!(rt->rt6i_flags & (RTF_NONEXTHOP | RTF_GATEWAY)))
|
|
nrt = rt6_alloc_cow(rt, &fl6->daddr, &fl6->saddr);
|
|
nrt = rt6_alloc_cow(rt, &fl6->daddr, &fl6->saddr);
|
|
- else if (!(rt->dst.flags & DST_HOST))
|
|
|
|
|
|
+ else if (!(rt->dst.flags & DST_HOST) || !(rt->dst.flags & RTF_LOCAL))
|
|
nrt = rt6_alloc_clone(rt, &fl6->daddr);
|
|
nrt = rt6_alloc_clone(rt, &fl6->daddr);
|
|
else
|
|
else
|
|
goto out2;
|
|
goto out2;
|
|
@@ -1172,7 +1172,7 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
|
|
struct rt6_info *rt6 = (struct rt6_info *)dst;
|
|
struct rt6_info *rt6 = (struct rt6_info *)dst;
|
|
|
|
|
|
dst_confirm(dst);
|
|
dst_confirm(dst);
|
|
- if (mtu < dst_mtu(dst) && rt6->rt6i_dst.plen == 128) {
|
|
|
|
|
|
+ if (mtu < dst_mtu(dst) && (rt6->rt6i_flags & RTF_CACHE)) {
|
|
struct net *net = dev_net(dst->dev);
|
|
struct net *net = dev_net(dst->dev);
|
|
|
|
|
|
rt6->rt6i_flags |= RTF_MODIFIED;
|
|
rt6->rt6i_flags |= RTF_MODIFIED;
|