LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Change-Id: I3fe08b0644b62b05987c4eb628264645b09a9e12
This commit is contained in:
TreeHugger Robot
2020-06-03 04:49:49 +00:00
committed by Automerger Merge Worker
parent eccf132341 07f6ff7138
commit e98255490e
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Tethering/src/android/net/ip/IpServer.java
View File

@@ -701,12 +701,7 @@ public class IpServer extends StateMachine {
final String upstreamIface = v6only.getInterfaceName(); final String upstreamIface = v6only.getInterfaceName();
params = new RaParams(); params = new RaParams();
// When BPF offload is enabled, we advertise an mtu lower by 16, which is the closest params.mtu = v6only.getMtu();
// 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.hasDefaultRoute = v6only.hasIpv6DefaultRoute(); params.hasDefaultRoute = v6only.hasIpv6DefaultRoute();
if (params.hasDefaultRoute) params.hopLimit = getHopLimit(upstreamIface, ttlAdjustment); if (params.hasDefaultRoute) params.hopLimit = getHopLimit(upstreamIface, ttlAdjustment);