| commit | 8a59bc1e23ce4e08ae398559d55464eae93b869f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jan 21 18:53:24 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 21 18:53:24 2022 +0000 |
| tree | 8b38cf30431378710c9ae683abf040d1cc9c2197 | |
| parent | ae403db0203b15052a3ba75f992cae619ae90409 [diff] | |
| parent | e3b2d16562b3a01247ad9e6621066a124cdaa667 [diff] |
Merge "bump tethering tc prio to make room for rate limiting" am: 29d5f0adbe am: e3b2d16562 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1859810 Change-Id: If2d4f174d5c1e63244ffe74e07c69524c6411959
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) {