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

Merge "A minor followup change for BPF offload device option stuff" am: 88536883e2 am: 03c8d55456

Browse Source 
Change-Id: Ia148434de4f497e2e90b207845ee037a65c98a02
This commit is contained in:
Maciej Żenczykowski
2020-05-12 19:04:39 +00:00
committed by Automerger Merge Worker
parent 2cc2f3b424 03c8d55456
commit f243a65531
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tethering/res/values/config.xml
View File

@@ -59,7 +59,7 @@
<!-- Use the BPF offload for tethering when the kernel has support. True by default. <!-- Use the BPF offload for tethering when the kernel has support. True by default.
If the device doesn't want to support tether BPF offload, this should be false. If the device doesn't want to support tether BPF offload, this should be false.
Note that this setting could be override by device config. Note that this setting could be overridden by device config.
--> -->
<bool translatable="false" name="config_tether_enable_bpf_offload">true</bool> <bool translatable="false" name="config_tether_enable_bpf_offload">true</bool>

2
Tethering/res/values/overlayable.xml
View File

@@ -25,7 +25,7 @@
<item type="array" name="config_tether_dhcp_range"/> <item type="array" name="config_tether_dhcp_range"/>
<!-- Use the BPF offload for tethering when the kernel has support. True by default. <!-- Use the BPF offload for tethering when the kernel has support. True by default.
If the device doesn't want to support tether BPF offload, this should be false. If the device doesn't want to support tether BPF offload, this should be false.
Note that this setting could be override by device config. Note that this setting could be overridden by device config.
--> -->
<item type="bool" name="config_tether_enable_bpf_offload"/> <item type="bool" name="config_tether_enable_bpf_offload"/>
<item type="bool" name="config_tether_enable_legacy_dhcp_server"/> <item type="bool" name="config_tether_enable_legacy_dhcp_server"/>

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

@@ -303,6 +303,8 @@ public class IpServer extends StateMachine {
private final IpNeighborMonitor mIpNeighborMonitor; private final IpNeighborMonitor mIpNeighborMonitor;
// TODO: Add a dependency object to pass the data members or variables from the tethering
// object. It helps to reduce the arguments of the constructor.
public IpServer( public IpServer(
String ifaceName, Looper looper, int interfaceType, SharedLog log, String ifaceName, Looper looper, int interfaceType, SharedLog log,
INetd netd, Callback callback, boolean usingLegacyDhcp, boolean usingBpfOffload, INetd netd, Callback callback, boolean usingLegacyDhcp, boolean usingBpfOffload,
@@ -325,14 +327,12 @@ public class IpServer extends StateMachine {
mIpNeighborMonitor = mDeps.getIpNeighborMonitor(getHandler(), mLog, mIpNeighborMonitor = mDeps.getIpNeighborMonitor(getHandler(), mLog,
new MyNeighborEventConsumer()); new MyNeighborEventConsumer());
// IP neighbor monitor monitors the neighbor event for adding/removing offload // IP neighbor monitor monitors the neighbor events for adding/removing offload
// forwarding rules per client. If BPF offload is not supported, don't start listening // forwarding rules per client. If BPF offload is not supported, don't start listening
// neighbor events. See updateIpv6ForwardingRules, addIpv6ForwardingRule, // for neighbor events. See updateIpv6ForwardingRules, addIpv6ForwardingRule,
// removeIpv6ForwardingRule. // removeIpv6ForwardingRule.
if (mUsingBpfOffload) { if (mUsingBpfOffload && !mIpNeighborMonitor.start()) {
if (!mIpNeighborMonitor.start()) { mLog.e("Failed to create IpNeighborMonitor on " + mIfaceName);
mLog.e("Failed to create IpNeighborMonitor on " + mIfaceName);
}
} }
mInitialState = new InitialState(); mInitialState = new InitialState();