summaryrefslogtreecommitdiff
path: root/src/network/networkd-address.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-address.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-address.h')
-rw-r--r--src/network/networkd-address.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h
index e5770155fa..0237c1cb98 100644
--- a/src/network/networkd-address.h
+++ b/src/network/networkd-address.h
@@ -61,9 +61,6 @@ struct Address {
/* Called when address become ready */
address_ready_callback_t callback;
-
- /* NetLabel */
- Set *netlabels;
};
const char* format_lifetime(char *buf, size_t l, usec_t lifetime_usec) _warn_unused_result_;
@@ -138,4 +135,3 @@ CONFIG_PARSER_PROTOTYPE(config_parse_address_flags);
CONFIG_PARSER_PROTOTYPE(config_parse_address_scope);
CONFIG_PARSER_PROTOTYPE(config_parse_address_route_metric);
CONFIG_PARSER_PROTOTYPE(config_parse_duplicate_address_detection);
-CONFIG_PARSER_PROTOTYPE(config_parse_address_netlabel);