From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 18 May 2021 04:05:31 +0000 (+0900)
Subject: network: address label: use struct in6_addr instead
X-Git-Tag: v249-rc1~76^2~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c0c8d1e72f73576df54fa97011e1945638cec77;p=thirdparty%2Fsystemd.git

network: address label: use struct in6_addr instead

Address label is for IPv6.
---

diff --git a/src/network/networkd-address-label.c b/src/network/networkd-address-label.c
index c697a55fb27..cf99473cf84 100644
--- a/src/network/networkd-address-label.c
+++ b/src/network/networkd-address-label.c
@@ -113,7 +113,7 @@ static int address_label_configure(AddressLabel *label, Link *link) {
         if (r < 0)
                 return log_link_error_errno(link, r, "Could not append IFAL_LABEL attribute: %m");
 
-        r = sd_netlink_message_append_in6_addr(req, IFA_ADDRESS, &label->in_addr.in6);
+        r = sd_netlink_message_append_in6_addr(req, IFA_ADDRESS, &label->in_addr);
         if (r < 0)
                 return log_link_error_errno(link, r, "Could not append IFA_ADDRESS attribute: %m");
 
@@ -197,7 +197,7 @@ int config_parse_address_label_prefix(const char *unit,
                 return 0;
         }
 
-        n->in_addr = a;
+        n->in_addr = a.in6;
         n->prefixlen = prefixlen;
 
         TAKE_PTR(n);
diff --git a/src/network/networkd-address-label.h b/src/network/networkd-address-label.h
index 11fdd9abfe2..5a93de4dfc0 100644
--- a/src/network/networkd-address-label.h
+++ b/src/network/networkd-address-label.h
@@ -16,7 +16,7 @@ typedef struct AddressLabel {
 
         unsigned char prefixlen;
         uint32_t label;
-        union in_addr_union in_addr;
+        struct in6_addr in_addr;
 } AddressLabel;
 
 AddressLabel *address_label_free(AddressLabel *label);