Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 734934aa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev am: 14756a8c

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

Change-Id: I6b9d57d44694daa75f9c61b610ea4dddcbffd16b
parents 263f63f0 14756a8c
Loading
Loading
Loading
Loading
+1 −6
Original line number Diff line number Diff line
@@ -730,12 +730,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);