diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-11-01 21:04:05 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 21:04:05 +0900 |
| commit | 3b73ebc08ada4d291e5a52ec2319d494f476a952 (patch) | |
| tree | 121452c61079681dbce991c7ce9cb6a4001ecc48 /src/libsystemd-network | |
| parent | 2c269a4e2a6e5d047f9389a4b617a58612211d16 (diff) | |
| parent | 01b4e90f32c72900f26f8f770cfb0e6d66c14706 (diff) | |
| download | systemd-3b73ebc08ada4d291e5a52ec2319d494f476a952.tar.gz | |
Merge pull request #21199 from yuwata/sd-dhcp6-client-trivial-cleanups
sd-dhcp6-client: trivial cleanups
Diffstat (limited to 'src/libsystemd-network')
| -rw-r--r-- | src/libsystemd-network/sd-dhcp6-client.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index 9a6be64789..d65993219b 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -251,10 +251,6 @@ int sd_dhcp6_client_set_mac( return 0; } - if (client->mac_addr_len == addr_len && - memcmp(&client->mac_addr, addr, addr_len) == 0) - return 0; - memcpy(&client->mac_addr, addr, addr_len); client->mac_addr_len = addr_len; client->arp_type = arp_type; @@ -1862,7 +1858,7 @@ int sd_dhcp6_client_new(sd_dhcp6_client **ret) { .ia_na.type = SD_DHCP6_OPTION_IA_NA, .ia_pd.type = SD_DHCP6_OPTION_IA_PD, .ifindex = -1, - .request_ia = DHCP6_REQUEST_IA_NA, + .request_ia = DHCP6_REQUEST_IA_NA | DHCP6_REQUEST_IA_PD, .fd = -1, .req_opts_len = ELEMENTSOF(default_req_opts), .hint_pd_prefix.iapdprefix.lifetime_preferred = (be32_t) -1, |