From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 29 Sep 2021 15:06:17 +0000 (+0900)
Subject: Merge pull request #20226 from yuwata/network-introduce-source-and-status
X-Git-Tag: v250-rc1~590
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca6bc7ce0d35d3eda358d13a167776468f36e3eb;p=thirdparty%2Fsystemd.git

Merge pull request #20226 from yuwata/network-introduce-source-and-status

network: introduce NetworkConfigSource and NetworkConfigState
---

ca6bc7ce0d35d3eda358d13a167776468f36e3eb
diff --cc src/network/networkd-link.h
index 9424a108303,fb7793f98da..d02c4fbd1e3
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@@ -156,23 -141,14 +142,14 @@@ typedef struct Link 
  
          sd_dhcp6_client *dhcp6_client;
          sd_dhcp6_lease *dhcp6_lease;
-         Set *dhcp6_addresses, *dhcp6_addresses_old;
-         Set *dhcp6_routes, *dhcp6_routes_old;
          Set *dhcp6_pd_prefixes;
-         Set *dhcp6_pd_addresses, *dhcp6_pd_addresses_old;
-         Set *dhcp6_pd_routes, *dhcp6_pd_routes_old;
-         unsigned dhcp6_address_messages;
-         unsigned dhcp6_route_messages;
-         unsigned dhcp6_pd_address_messages;
-         unsigned dhcp6_pd_route_messages;
-         bool dhcp6_address_configured:1;
-         bool dhcp6_route_configured:1;
-         bool dhcp6_pd_address_configured:1;
-         bool dhcp6_pd_route_configured:1;
-         bool dhcp6_pd_prefixes_assigned:1;
+         unsigned dhcp6_messages;
+         unsigned dhcp6_pd_messages;
+         bool dhcp6_configured:1;
+         bool dhcp6_pd_configured:1;
  
          /* This is about LLDP reception */
 -        sd_lldp *lldp;
 +        sd_lldp_rx *lldp_rx;
          char *lldp_file;
  
          /* This is about LLDP transmission */