From 39de84ab4c14c48f74b827eb0d4945910eb83c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Tue, 12 Aug 2025 19:51:56 -0700
Subject: [PATCH] Tethering: allow ipv6 1500 mtu again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

but still fallback to 1400 if we don't know any better

Bug: 432676104
Test: TreeHugger, mm in p/m/C
Flag: EXEMPT mainline
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I7e1d70e73d2fd24d1f79dc40f3b18a6d82d235ef
---
 Tethering/src/android/net/ip/IpServer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Tethering/src/android/net/ip/IpServer.java b/Tethering/src/android/net/ip/IpServer.java
index f51610344c..b70df59a95 100644
--- a/Tethering/src/android/net/ip/IpServer.java
+++ b/Tethering/src/android/net/ip/IpServer.java
@@ -862,8 +862,8 @@ public class IpServer extends StateMachineShim {
             for (RouteInfo route : v6only.getRoutes()) {
                 if (route.getMtu() >= 1280) pmtu6 = Math.min(pmtu6, route.getMtu());
             }
-            // Clamp v6 MTU to 1280-1400 range.
-            pmtu6 = Math.max(1280, Math.min(1400, pmtu6));
+            // Clamp v6 MTU to 1280-1500 range.
+            if (pmtu6 > 1500) pmtu6 = 1500;
             params.mtu = pmtu6;
             params.hasDefaultRoute = v6only.hasIpv6DefaultRoute();