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
This commit is contained in:
Treehugger Robot
2021-11-22 09:27:17 +00:00
committed by Automerger Merge Worker

View File

@@ -174,6 +174,7 @@ static jboolean com_android_networkstack_tethering_BpfUtils_isEthernet(JNIEnv* e
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;