| commit | e3b2d16562b3a01247ad9e6621066a124cdaa667 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jan 21 18:35:04 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 21 18:35:04 2022 +0000 |
| tree | d87c3c522d37ef002f7578a3dec36ab88af8dc87 | |
| parent | 3593d90f05fd354b460e52daa088cd8e9b6a6c89 [diff] | |
| parent | 29d5f0adbe0ad328e17d58d46f0fee2ca1cb5a7a [diff] |
Merge "bump tethering tc prio to make room for rate limiting" am: 29d5f0adbe Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1859810 Change-Id: I99413c0d362d28b86dfbfb2e9a070fc0703911d2
diff --git a/Tethering/src/com/android/networkstack/tethering/BpfUtils.java b/Tethering/src/com/android/networkstack/tethering/BpfUtils.java index ad410eb..77efb51 100644 --- a/Tethering/src/com/android/networkstack/tethering/BpfUtils.java +++ b/Tethering/src/com/android/networkstack/tethering/BpfUtils.java
@@ -55,11 +55,11 @@ static final boolean DOWNSTREAM = true; static final boolean UPSTREAM = false; - // The priority of clat/tether hooks - smaller is higher priority. + // The priority of tether hooks - smaller is higher priority. // TC tether is higher priority then TC clat to match XDP winning over TC. - // Sync from system/netd/server/OffloadUtils.h. - static final short PRIO_TETHER6 = 1; - static final short PRIO_TETHER4 = 2; + // Sync from system/netd/server/TcUtils.h. + static final short PRIO_TETHER6 = 2; + static final short PRIO_TETHER4 = 3; // note that the above must be lower than PRIO_CLAT from netd's OffloadUtils.cpp private static String makeProgPath(boolean downstream, int ipVersion, boolean ether) {