Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev am: 36ff42e508 am: 07f6ff7138

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11620914

Change-Id: I260a3aaf2d2511a1943125083414c5a3ef1e689e
This commit is contained in:
TreeHugger Robot
2020-06-03 04:37:09 +00:00
committed by Automerger Merge Worker

View File

@@ -701,12 +701,7 @@ public class IpServer extends StateMachine {
final String upstreamIface = v6only.getInterfaceName();
params = new RaParams();
// When BPF offload is enabled, we advertise an mtu lower by 16, which is the closest
// multiple of 8 >= 14, the ethernet header size. This makes kernel ebpf tethering
// offload happy. This hack should be reverted once we have the kernel fixed up.
// Note: this will automatically clamp to at least 1280 (ipv6 minimum mtu)
// see RouterAdvertisementDaemon.java putMtu()
params.mtu = mUsingBpfOffload ? v6only.getMtu() - 16 : v6only.getMtu();
params.mtu = v6only.getMtu();
params.hasDefaultRoute = v6only.hasIpv6DefaultRoute();
if (params.hasDefaultRoute) params.hopLimit = getHopLimit(upstreamIface, ttlAdjustment);