diff --git a/Tethering/src/android/net/ip/IpServer.java b/Tethering/src/android/net/ip/IpServer.java
index 1b93480ac3..15513453b2 100644
--- a/Tethering/src/android/net/ip/IpServer.java
+++ b/Tethering/src/android/net/ip/IpServer.java
@@ -893,7 +893,7 @@ public class IpServer extends StateMachineShim {
         // mLastIPv6UpstreamIfindex and mLastIPv6UpstreamPrefixes because BpfCoordinator will call
         // IpServer#getIpv6UpstreamIfindex and IpServer#getIpv6UpstreamPrefixes to retrieve current
         // upstream interface index and prefixes when handling upstream changes.
-        mBpfCoordinator.updateIpv6UpstreamInterface(this, upstreamIfIndex, upstreamPrefixes);
+        mBpfCoordinator.updateIpv6UpstreamInterface(this, upstreamIfIndex, upstreamPrefixes, 1400);
         mLastIPv6LinkProperties = v6only;
         mLastIPv6UpstreamIfindex = upstreamIfIndex;
         mLastIPv6UpstreamPrefixes = upstreamPrefixes;
@@ -1447,7 +1447,7 @@ public class IpServer extends StateMachineShim {
             for (String ifname : mUpstreamIfaceSet.ifnames) cleanupUpstreamInterface(ifname);
             mUpstreamIfaceSet = null;
             mBpfCoordinator.updateIpv6UpstreamInterface(IpServer.this, NO_UPSTREAM,
-                    Collections.emptySet());
+                    Collections.emptySet(), 1400);
         }
 
         private void cleanupUpstreamInterface(String upstreamIface) {
diff --git a/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java b/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java
index 058f394294..8f701ba87f 100644
--- a/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java
+++ b/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java
@@ -958,7 +958,7 @@ public class BpfCoordinator {
      * Note that this can be only called on handler thread.
      */
     public void updateIpv6UpstreamInterface(@NonNull final IpServer ipServer, int upstreamIfindex,
-            @NonNull Set<IpPrefix> upstreamPrefixes) {
+            @NonNull Set<IpPrefix> upstreamPrefixes, int pmtu) {
         if (!isUsingBpf()) return;
 
         // If the upstream interface has changed, remove all rules and re-add them with the new
@@ -971,7 +971,7 @@ public class BpfCoordinator {
             final boolean upstreamSupportsBpf = checkUpstreamSupportsBpf(upstreamIfindex);
             updateAllIpv6Rules(ipServer, interfaceParams,
                     getInterfaceIndexForRule(upstreamIfindex, upstreamSupportsBpf),
-                    upstreamPrefixes, 1400);
+                    upstreamPrefixes, pmtu);
         }
     }
 
diff --git a/Tethering/tests/unit/src/android/net/ip/IpServerTest.java b/Tethering/tests/unit/src/android/net/ip/IpServerTest.java
index 1d0deff3d8..370bc56e93 100644
--- a/Tethering/tests/unit/src/android/net/ip/IpServerTest.java
+++ b/Tethering/tests/unit/src/android/net/ip/IpServerTest.java
@@ -290,7 +290,7 @@ public class IpServerTest {
             verify(mBpfCoordinator, times(2)).maybeAddUpstreamToLookupTable(
                     interfaceParams.index, upstreamIface);
             verify(mBpfCoordinator).updateIpv6UpstreamInterface(
-                    mIpServer, interfaceParams.index, upstreamPrefixes);
+                    mIpServer, interfaceParams.index, upstreamPrefixes, 1400);
         }
         reset(mNetd, mBpfCoordinator, mCallback, mRoutingCoordinatorManager);
         when(mRoutingCoordinatorManager.requestStickyDownstreamAddress(anyInt(), anyInt(),
@@ -638,7 +638,7 @@ public class IpServerTest {
         inOrder.verify(mRoutingCoordinatorManager)
                 .removeInterfaceForward(IFACE_NAME, UPSTREAM_IFACE);
         inOrder.verify(mBpfCoordinator).updateIpv6UpstreamInterface(
-                mIpServer, NO_UPSTREAM, NO_PREFIXES);
+                mIpServer, NO_UPSTREAM, NO_PREFIXES, 1400);
         // When tethering stops, upstream interface is set to zero and thus clearing all upstream
         // rules. Downstream rules are needed to be cleared explicitly by calling
         // BpfCoordinator#clearAllIpv6Rules in TetheredState#exit.
@@ -858,7 +858,7 @@ public class IpServerTest {
         lp.setLinkAddresses(UPSTREAM_ADDRESSES);
         dispatchTetherConnectionChanged(UPSTREAM_IFACE2, lp, -1);
         verify(mBpfCoordinator).updateIpv6UpstreamInterface(
-                mIpServer, UPSTREAM_IFINDEX2, UPSTREAM_PREFIXES);
+                mIpServer, UPSTREAM_IFINDEX2, UPSTREAM_PREFIXES, 1400);
         reset(mBpfCoordinator);
 
         // Upstream link addresses change result in updating the rules.
@@ -867,7 +867,7 @@ public class IpServerTest {
         lp2.setLinkAddresses(UPSTREAM_ADDRESSES2);
         dispatchTetherConnectionChanged(UPSTREAM_IFACE2, lp2, -1);
         verify(mBpfCoordinator).updateIpv6UpstreamInterface(
-                mIpServer, UPSTREAM_IFINDEX2, UPSTREAM_PREFIXES2);
+                mIpServer, UPSTREAM_IFINDEX2, UPSTREAM_PREFIXES2, 1400);
         reset(mBpfCoordinator);
 
         // When the upstream is lost, rules are removed.
@@ -877,33 +877,33 @@ public class IpServerTest {
         // - processMessage CMD_IPV6_TETHER_UPDATE for the IPv6 upstream is lost.
         // See dispatchTetherConnectionChanged.
         verify(mBpfCoordinator, times(2)).updateIpv6UpstreamInterface(
-                mIpServer, NO_UPSTREAM, NO_PREFIXES);
+                mIpServer, NO_UPSTREAM, NO_PREFIXES, 1400);
         reset(mBpfCoordinator);
 
         // If the upstream is IPv4-only, no rules are added.
         dispatchTetherConnectionChanged(UPSTREAM_IFACE);
         verify(mBpfCoordinator, never()).updateIpv6UpstreamInterface(
-                mIpServer, NO_UPSTREAM, NO_PREFIXES);
+                mIpServer, NO_UPSTREAM, NO_PREFIXES, 1400);
         reset(mBpfCoordinator);
 
         // Rules are added again once upstream IPv6 connectivity is available.
         lp.setInterfaceName(UPSTREAM_IFACE);
         dispatchTetherConnectionChanged(UPSTREAM_IFACE, lp, -1);
         verify(mBpfCoordinator).updateIpv6UpstreamInterface(
-                mIpServer, UPSTREAM_IFINDEX, UPSTREAM_PREFIXES);
+                mIpServer, UPSTREAM_IFINDEX, UPSTREAM_PREFIXES, 1400);
         reset(mBpfCoordinator);
 
         // If upstream IPv6 connectivity is lost, rules are removed.
         dispatchTetherConnectionChanged(UPSTREAM_IFACE, null, 0);
         verify(mBpfCoordinator).updateIpv6UpstreamInterface(
-                mIpServer, NO_UPSTREAM, NO_PREFIXES);
+                mIpServer, NO_UPSTREAM, NO_PREFIXES, 1400);
         reset(mBpfCoordinator);
 
         // When upstream IPv6 connectivity comes back, rules are added.
         lp.setInterfaceName(UPSTREAM_IFACE);
         dispatchTetherConnectionChanged(UPSTREAM_IFACE, lp, -1);
         verify(mBpfCoordinator).updateIpv6UpstreamInterface(
-                mIpServer, UPSTREAM_IFINDEX, UPSTREAM_PREFIXES);
+                mIpServer, UPSTREAM_IFINDEX, UPSTREAM_PREFIXES, 1400);
         reset(mBpfCoordinator);
 
         // When the downstream interface goes down, rules are removed.
@@ -912,7 +912,7 @@ public class IpServerTest {
         verify(mBpfCoordinator).clearAllIpv6Rules(mIpServer);
         verify(mBpfCoordinator).removeIpServer(mIpServer);
         verify(mBpfCoordinator).updateIpv6UpstreamInterface(
-                mIpServer, NO_UPSTREAM, NO_PREFIXES);
+                mIpServer, NO_UPSTREAM, NO_PREFIXES, 1400);
         reset(mBpfCoordinator);
     }
 
diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java
index 7e5ded9277..f985e1b282 100644
--- a/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java
+++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java
@@ -604,7 +604,7 @@ public class BpfCoordinatorTest {
     private void dispatchIpv6UpstreamChanged(BpfCoordinator bpfCoordinator, IpServer ipServer,
             int upstreamIfindex, String upstreamIface, Set<IpPrefix> upstreamPrefixes) {
         bpfCoordinator.maybeAddUpstreamToLookupTable(upstreamIfindex, upstreamIface);
-        bpfCoordinator.updateIpv6UpstreamInterface(ipServer, upstreamIfindex, upstreamPrefixes);
+        bpfCoordinator.updateIpv6UpstreamInterface(ipServer, upstreamIfindex, upstreamPrefixes, 1400);
         when(ipServer.getIpv6UpstreamIfindex()).thenReturn(upstreamIfindex);
         when(ipServer.getIpv6UpstreamPrefixes()).thenReturn(upstreamPrefixes);
     }
@@ -1535,7 +1535,7 @@ public class BpfCoordinatorTest {
 
         // The rule can't be updated.
         coordinator.updateIpv6UpstreamInterface(mIpServer, rule.upstreamIfindex + 1 /* new */,
-                UPSTREAM_PREFIXES);
+                UPSTREAM_PREFIXES, 1400);
         verifyNeverRemoveDownstreamRule();
         verifyNeverAddDownstreamRule();
         rules = coordinator.getIpv6DownstreamRulesForTesting().get(mIpServer);