| commit | 0eeb70a385e93ae680f351e3f005033d2b9c7eda | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Nov 22 09:06:09 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 22 09:06:09 2021 +0000 |
| tree | 1afc622451526d9c5da1e5a83d82fd0a3a1f2e50 | |
| parent | 3d29edb485f675806e419704715ec41f5bed01d8 [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: I19aba9428c44ea25bacac383e2bb276daf056739
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;