diff options
author | Alex Shi <alex.shi@linaro.org> | 2015-03-13 09:15:58 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2015-03-13 15:21:35 +0800 |
commit | 438628396ca8a44f6b710a73612939bc54633d7c (patch) | |
tree | bf318740f48ff4699cd0154e900507597dae835e /net/ipv6/route.c | |
parent | 5afe132e300375c685e60d80d6e5e6a822d216d6 (diff) | |
parent | 0d590a1ecd1ad44b2dae2bcdc5a6cb24a7080489 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Remove cpuinfo_arm64/cpuinfo_store_cpu() that comes from commit
42b34c73ae40(used for stable kernel only), since we have
newer commit 5aa9ef6f286.
Conflicts:
arch/arm64/include/asm/cputype.h
arch/arm64/kernel/setup.c
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r-- | net/ipv6/route.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index d4ee85294a66..021749a0b49d 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1156,12 +1156,9 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk, struct net *net = dev_net(dst->dev); rt6->rt6i_flags |= RTF_MODIFIED; - if (mtu < IPV6_MIN_MTU) { - u32 features = dst_metric(dst, RTAX_FEATURES); + if (mtu < IPV6_MIN_MTU) mtu = IPV6_MIN_MTU; - features |= RTAX_FEATURE_ALLFRAG; - dst_metric_set(dst, RTAX_FEATURES, features); - } + dst_metric_set(dst, RTAX_MTU, mtu); rt6_update_expires(rt6, net->ipv6.sysctl.ip6_rt_mtu_expires); } |