joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

bpf/progs/netd: remove DATA_SAVER_ENABLED_MAP_SIZE constant

Browse source 
(only needed by test, but this is really just a single boolean)

Test: TreeHugger
Flag: EXEMPT mainline
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3cf8ae1ca474ccd3feba6d6346428a46c3020122
This commit is contained in:
Maciej Żenczykowski 2025-07-15 12:19:45 -07:00
commit 00c01a6e8f
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bpf/dns_helper/DnsBpfHelperTest.cpp
View file

@ -43,7 +43,7 @@ class DnsBpfHelperTest : public ::testing::Test {
mFakeUidOwnerMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE); mFakeUidOwnerMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE);
ASSERT_VALID(mFakeUidOwnerMap); ASSERT_VALID(mFakeUidOwnerMap);
mFakeDataSaverEnabledMap.resetMap(BPF_MAP_TYPE_ARRAY, DATA_SAVER_ENABLED_MAP_SIZE); mFakeDataSaverEnabledMap.resetMap(BPF_MAP_TYPE_ARRAY, 1);
ASSERT_VALID(mFakeDataSaverEnabledMap); ASSERT_VALID(mFakeDataSaverEnabledMap);
mDnsBpfHelper.mConfigurationMap = mFakeConfigurationMap; mDnsBpfHelper.mConfigurationMap = mFakeConfigurationMap;

3
bpf/progs/netd.c
View file

@ -93,8 +93,7 @@ DEFINE_BPF_RINGBUF_EXT(packet_trace_ringbuf, PacketTrace, 32 * 1024,
AID_ROOT, AID_SYSTEM, 0060, "fs_bpf_net_shared", "", PRIVATE, AID_ROOT, AID_SYSTEM, 0060, "fs_bpf_net_shared", "", PRIVATE,
BPFLOADER_MAINLINE_U_VERSION, BPFLOADER_MAX_VER); BPFLOADER_MAINLINE_U_VERSION, BPFLOADER_MAX_VER);
DEFINE_BPF_MAP_RO_NETD(data_saver_enabled_map, ARRAY, uint32_t, bool, DEFINE_BPF_MAP_RO_NETD(data_saver_enabled_map, ARRAY, uint32_t, bool, 1)
DATA_SAVER_ENABLED_MAP_SIZE)
DEFINE_BPF_MAP_EXT(local_net_access_map, LPM_TRIE, LocalNetAccessKey, bool, 1000, DEFINE_BPF_MAP_EXT(local_net_access_map, LPM_TRIE, LocalNetAccessKey, bool, 1000,
AID_ROOT, AID_NET_BW_ACCT, 0060, "fs_bpf_net_shared", "", PRIVATE, AID_ROOT, AID_NET_BW_ACCT, 0060, "fs_bpf_net_shared", "", PRIVATE,

1
bpf/progs/netd.h
View file

@ -98,7 +98,6 @@ STRUCT_SIZE(SkStorageValue, 8);
// 'static' - otherwise these constants end up in .rodata in the resulting .o post compilation // 'static' - otherwise these constants end up in .rodata in the resulting .o post compilation
static const int STATS_MAP_SIZE = 5000; static const int STATS_MAP_SIZE = 5000;
static const int CONFIGURATION_MAP_SIZE = 2; static const int CONFIGURATION_MAP_SIZE = 2;
static const int DATA_SAVER_ENABLED_MAP_SIZE = 1;
#ifdef __cplusplus #ifdef __cplusplus