summaryrefslogtreecommitdiff
path: root/src/network/networkd-network.h
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2022-06-22 22:28:46 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2022-06-22 22:34:26 +0900
commita32badc5a6c3f1bbf27250a12830908bd0fd20e8 (patch)
treefdbecf1fc3583890b8b744057ecec16c9091acd6 /src/network/networkd-network.h
parentb48ed70c79c6482e1f39b77d16e62043ff5042a5 (diff)
downloadsystemd-a32badc5a6c3f1bbf27250a12830908bd0fd20e8.tar.gz
Revert "networkd: NetLabel integration"
This reverts PR #23269 and its follow-up commit. Especially, 2299b1cae32c1fb8911da0ce26efced68032f4f8 (partially), and 3cf63830acdef9d8afdc9ef1cf25aa7e85a5e4d5. The PR was merged without final approval, and has several issues: - The NetLabel for static addresses are not assigned, as labels are stored in the Address objects managed by Network, instead of Link. - If NetLabel is specified for a static address, then the address section will be invalid and the address will not be configured, - It should be implemented with Request object, - There is no test about the feature.
Diffstat (limited to 'src/network/networkd-network.h')
-rw-r--r--src/network/networkd-network.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
index 96cd316e01..98e6159040 100644
--- a/src/network/networkd-network.h
+++ b/src/network/networkd-network.h
@@ -155,7 +155,6 @@ struct Network {
Set *dhcp_request_options;
OrderedHashmap *dhcp_client_send_options;
OrderedHashmap *dhcp_client_send_vendor_options;
- Set *dhcp_netlabels;
/* DHCPv6 Client support */
bool dhcp6_use_address;
@@ -180,7 +179,6 @@ struct Network {
OrderedHashmap *dhcp6_client_send_options;
OrderedHashmap *dhcp6_client_send_vendor_options;
Set *dhcp6_request_options;
- Set *dhcp6_netlabels;
/* DHCP Server Support */
bool dhcp_server;
@@ -237,7 +235,6 @@ struct Network {
Set *dhcp_pd_tokens;
int dhcp_pd_uplink_index;
char *dhcp_pd_uplink_name;
- Set *dhcp_pd_netlabels;
/* Bridge Support */
int use_bpdu;
@@ -322,7 +319,6 @@ struct Network {
Set *ndisc_deny_listed_route_prefix;
Set *ndisc_allow_listed_route_prefix;
Set *ndisc_tokens;
- Set *ndisc_netlabels;
/* LLDP support */
LLDPMode lldp_mode; /* LLDP reception */