aboutsummaryrefslogtreecommitdiff
path: root/net/ipv6/route.c
diff options
context:
space:
mode:
authorJan Engelmohr <jan.engelmohr@mailbox.tu-dresden.de>2016-07-26 18:07:05 +0200
committerMoyster <oysterized@gmail.com>2016-08-26 15:59:30 +0200
commita2904e3eed56216fe65091d9b3638ae1f90e43fa (patch)
tree2d33c26327fde2201600aaec2ac4ae84dbe16499 /net/ipv6/route.c
parentc185b77b187a5b9af6fcfaaa5486c52cd902b1d1 (diff)
3.10.69 -> 3.10.70
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r--net/ipv6/route.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 03b1e6fde..ee84a3a3b 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1137,12 +1137,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);
}