commit | c8c36b94079760a8e77b7161b6ec86a7b7707a9d | [log] [tgz] |
---|---|---|
author | Maciej Żenczykowski <maze@google.com> | Thu Nov 18 23:29:23 2021 -0800 |
committer | Maciej Żenczykowski <maze@google.com> | Thu Nov 18 23:31:56 2021 -0800 |
tree | 8495071788f7d289521d0cccbd88f71bec498751 | |
parent | a457bf7ea84e759e53376260cab056eb8b963c9c [diff] |
isEthernet() - ARPHRD_PPP does not require ethernet headers (this is required to make ipv6 tethering work with at least S.LSI modems) Test: TreeHugger Bug: 207057951 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ic178db928ec7f74f69d7d4739b3b8439ff026625
diff --git a/Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp b/Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp index 2d679a8..9838bf1 100644 --- a/Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp +++ b/Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp
@@ -174,6 +174,7 @@ case ARPHRD_ETHER: return true; case ARPHRD_NONE: + case ARPHRD_PPP: case ARPHRD_RAWIP: // in Linux 4.14+ rmnet support was upstreamed and this is 519 case 530: // this is ARPHRD_RAWIP on some Android 4.9 kernels with rmnet return false;