diff --git a/Tethering/src/android/net/ip/IpServer.java b/Tethering/src/android/net/ip/IpServer.java index e8796b9647..ee0487bc6d 100644 --- a/Tethering/src/android/net/ip/IpServer.java +++ b/Tethering/src/android/net/ip/IpServer.java @@ -856,7 +856,8 @@ public class IpServer extends StateMachineShim { upstreamIfIndex = upstreamIfaceParams.index; } params = new RaParams(); - params.mtu = v6only.getMtu(); + // Clamp v6 MTU to 1280-1400 range. + params.mtu = Math.max(1280, Math.min(1400, v6only.getMtu())); params.hasDefaultRoute = v6only.hasIpv6DefaultRoute(); if (params.hasDefaultRoute) params.hopLimit = getHopLimit(upstreamIface, ttlAdjustment);