| commit | 304682001148e1dd1ec7d0f74c73d104fd3353e6 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Nov 22 09:06:23 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 22 09:06:23 2021 +0000 |
| tree | f181da01248dd71bd63238bc40202440562f82ba | |
| parent | 0061457a54101a3e774865c8d47d69025041c842 [diff] | |
| parent | 73b42b0f955c23975e1b290facb87561882b93f4 [diff] |
Merge "isEthernet() - ARPHRD_PPP does not require ethernet headers" am: 73b42b0f95 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1897432 Change-Id: I560b34da41630c16977614a1a1e4770672dcf022
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;