summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2022-07-13 21:56:07 +0200
committerYu Watanabe <watanabe.yu+github@gmail.com>2022-07-13 23:51:59 +0200
commit8f4f6307313ccad0b068697bb054a105e5a50e92 (patch)
tree72311404f38873be3ec18d0e7404abdf90cb3359
parentDo not fail EFI build with newer binutils (diff)
downloadsystemd-8f4f6307313ccad0b068697bb054a105e5a50e92.tar.xz
systemd-8f4f6307313ccad0b068697bb054a105e5a50e92.zip
Revert "network: configure DHCP clients after MAC address is assigned"
This reverts commit f42d41cc5f9cd8cac538a1c30fda04d346b5bae2. DHCPv6 client does not require MAC address. DHCPv4 client will be handled in a different way in a later commit. Partially fixes #23546.
-rw-r--r--src/network/networkd-dhcp-common.c7
-rw-r--r--src/network/networkd-dhcp4.c5
-rw-r--r--src/network/networkd-dhcp6.c5
3 files changed, 0 insertions, 17 deletions
diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
index 43c8ca42fe..45faf4f128 100644
--- a/src/network/networkd-dhcp-common.c
+++ b/src/network/networkd-dhcp-common.c
@@ -61,13 +61,6 @@ bool link_dhcp_enabled(Link *link, int family) {
if (link->iftype == ARPHRD_CAN)
return false;
- if (!IN_SET(link->hw_addr.length, ETH_ALEN, INFINIBAND_ALEN) &&
- !streq_ptr(link->kind, "wwan"))
- /* Currently, only interfaces whose MAC address length is ETH_ALEN or INFINIBAND_ALEN
- * are supported. Note, wwan interfaces may be assigned MAC address slightly later.
- * Hence, let's wait for a while.*/
- return false;
-
if (!link->network)
return false;
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index 5770b48767..20db4f5f83 100644
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -1545,11 +1545,6 @@ static int dhcp4_process_request(Request *req, Link *link, void *userdata) {
if (!IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED))
return 0;
- if (!IN_SET(link->hw_addr.length, ETH_ALEN, INFINIBAND_ALEN) ||
- hw_addr_is_null(&link->hw_addr))
- /* No MAC address is assigned to the hardware, or non-supported MAC address length. */
- return 0;
-
r = dhcp4_configure_duid(link);
if (r <= 0)
return r;
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index 3dc34f0e52..72ec6826bd 100644
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -738,11 +738,6 @@ static int dhcp6_process_request(Request *req, Link *link, void *userdata) {
if (!IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED))
return 0;
- if (!IN_SET(link->hw_addr.length, ETH_ALEN, INFINIBAND_ALEN) ||
- hw_addr_is_null(&link->hw_addr))
- /* No MAC address is assigned to the hardware, or non-supported MAC address length. */
- return 0;
-
r = dhcp_configure_duid(link, link_get_dhcp6_duid(link));
if (r <= 0)
return r;