Merge changes I5ffa2faf,Id5f14d6e

* changes:
  add proper minimum bpfloader version annotations for block/clatd/dscp_policy/netd
  move netd maps and progs into /sys/fs/bpf/netd_shared/...
This commit is contained in:
Treehugger Robot
2022-05-17 15:39:02 +00:00
committed by Gerrit Code Review
10 changed files with 67 additions and 51 deletions

View File

@@ -748,7 +748,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
* The BPF program attached to the tc-police hook to account for to-be-dropped traffic.
*/
private static final String TC_POLICE_BPF_PROG_PATH =
"/sys/fs/bpf/net_shared/prog_netd_schedact_ingress_account";
"/sys/fs/bpf/netd_shared/prog_netd_schedact_ingress_account";
private static String eventName(int what) {
return sMagicDecoderRing.get(what, Integer.toString(what));