commit cb7d5bd200267047483d80e37cbca0c9a6cf7dbc
author Maciej Żenczykowski <maze@google.com> Fri Mar 05 07:27:32 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 05 07:27:32 2021 +0000
tree c2d2363dc865e36fc226f02cc4367549a5074df6
parent 20c88e6e6f0d025a188a021b1a4ebe277b534f55
parent b6cf0d8785ad57c4de97abf68507d456bdc8d0a7

Merge "bpf offload - add a new 'tether_xdp_devmap'" am: b908e0c867 am: f5a9d32a73 am: b6cf0d8785

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612879

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b47fb6df05d41232eddcf41989d1b19d05dc1d8

Tethering/bpf_progs/offload.c

diff --git a/Tethering/bpf_progs/offload.c b/Tethering/bpf_progs/offload.c
index ea64343..bfa1e3a 100644
--- a/Tethering/bpf_progs/offload.c
+++ b/Tethering/bpf_progs/offload.c
@@ -723,6 +723,9 @@
 
 // ----- XDP Support -----
 
+DEFINE_BPF_MAP_GRW(tether_xdp_devmap, DEVMAP_HASH, uint32_t, uint32_t, 64,
+                   AID_NETWORK_STACK)
+
 #define DEFINE_XDP_PROG(str, func) \
     DEFINE_BPF_PROG_KVER(str, AID_ROOT, AID_NETWORK_STACK, func, KVER(5, 9, 0))(struct xdp_md *ctx)