| commit | a4feab485a71eb9717397ea83c442ff366cbd22a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Nov 22 09:27:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 22 09:27:17 2021 +0000 |
| tree | 33a1036b0880a3d391d28b8a76477b3c62289de3 | |
| parent | f6affa800b52c3c1d7a7bfa4c2f808c3060e764d [diff] | |
| parent | ca8500dcc20ce17fabc4e0845bdff90e8ae72280 [diff] |
Merge "isEthernet() - ARPHRD_PPP does not require ethernet headers" am: 73b42b0f95 am: 3046820011 am: ca8500dcc2 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1897432 Change-Id: I433ad51a05dbb11c61a63c4a4474e7b85d0171ec
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;