From: Yu Watanabe Date: Tue, 17 Sep 2024 06:00:06 +0000 (+0900) Subject: network: drop unnecessary BPF related objects from Manager when disabled X-Git-Tag: v257-rc1~421^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F34443%2Fhead;p=thirdparty%2Fsystemd.git network: drop unnecessary BPF related objects from Manager when disabled --- diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index f172e0d8654..2813fa1f284 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -604,7 +604,9 @@ int manager_new(Manager **ret, bool test_mode) { .duid_product_uuid.type = DUID_TYPE_UUID, .dhcp_server_persist_leases = true, .ip_forwarding = { -1, -1, }, +#if HAVE_VMLINUX_H .cgroup_fd = -EBADF, +#endif }; *ret = TAKE_PTR(m); diff --git a/src/network/networkd-manager.h b/src/network/networkd-manager.h index 9a310c2eab6..05a86b6b58b 100644 --- a/src/network/networkd-manager.h +++ b/src/network/networkd-manager.h @@ -122,12 +122,14 @@ struct Manager { /* sysctl */ int ip_forwarding[2]; +#if HAVE_VMLINUX_H Hashmap *sysctl_shadow; sd_event_source *sysctl_event_source; struct ring_buffer *sysctl_buffer; struct sysctl_monitor_bpf *sysctl_skel; struct bpf_link *sysctl_link; int cgroup_fd; +#endif }; int manager_new(Manager **ret, bool test_mode);