From af1f314cbd82aaa9c0b9333f63b4eaaeceb4b10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 18 Mar 2021 02:33:26 -0700 Subject: [PATCH 1/2] change PRIO_CLAT into a comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test: atest, TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: I44f3dc9e3a3462f275a04ed5601370f664b985a2 --- Tethering/src/com/android/networkstack/tethering/BpfUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tethering/src/com/android/networkstack/tethering/BpfUtils.java b/Tethering/src/com/android/networkstack/tethering/BpfUtils.java index 289452c783..0b44249458 100644 --- a/Tethering/src/com/android/networkstack/tethering/BpfUtils.java +++ b/Tethering/src/com/android/networkstack/tethering/BpfUtils.java @@ -56,7 +56,7 @@ public class BpfUtils { // Sync from system/netd/server/OffloadUtils.h. static final short PRIO_TETHER6 = 1; static final short PRIO_TETHER4 = 2; - static final short PRIO_CLAT = 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) { String path = "/sys/fs/bpf/tethering/prog_offload_schedcls_tether_" From 3f32a83207893892ef7ebf18548cc1c49888e3f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Wed, 17 Mar 2021 19:27:23 -0700 Subject: [PATCH 2/2] fix whitespace in offload.c macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test: atest, TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: Ibe325714f95a1accce8add16220a31ca15913816 --- Tethering/bpf_progs/offload.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tethering/bpf_progs/offload.c b/Tethering/bpf_progs/offload.c index 7f9754d896..5f29d4f60a 100644 --- a/Tethering/bpf_progs/offload.c +++ b/Tethering/bpf_progs/offload.c @@ -72,11 +72,11 @@ DEFINE_BPF_MAP_GRW(tether_error_map, ARRAY, uint32_t, uint32_t, BPF_TETHER_ERR__MAX, AID_NETWORK_STACK) -#define COUNT_AND_RETURN(counter, ret) do { \ +#define COUNT_AND_RETURN(counter, ret) do { \ uint32_t code = BPF_TETHER_ERR_ ## counter; \ uint32_t *count = bpf_tether_error_map_lookup_elem(&code); \ - if (count) __sync_fetch_and_add(count, 1); \ - return ret; \ + if (count) __sync_fetch_and_add(count, 1); \ + return ret; \ } while(0) #define TC_DROP(counter) COUNT_AND_RETURN(counter, TC_ACT_SHOT)