From: Yu Watanabe Date: Wed, 13 Jul 2022 21:50:15 +0000 (+0900) Subject: network: NDisc does not require MAC address X-Git-Tag: v252-rc1~661^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56bb67180a18562b04cb66e07f7fa53d6014ecf8;p=thirdparty%2Fsystemd.git network: NDisc does not require MAC address This effectively revert ba4c7184b320bb8698d470530d46a6c94641cc6e. Fixes #23546. --- diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index f66745a4ff0..8ace451f7fd 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -38,12 +38,6 @@ bool link_ipv6_accept_ra_enabled(Link *link) { if (link->iftype == ARPHRD_CAN) return false; - if (link->hw_addr.length != ETH_ALEN && !streq_ptr(link->kind, "wwan")) - /* Currently, only interfaces whose MAC address length is ETH_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; @@ -1106,10 +1100,6 @@ static int ndisc_process_request(Request *req, Link *link, void *userdata) { if (!IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED)) return 0; - if (link->hw_addr.length != ETH_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 = ndisc_configure(link); if (r < 0) return log_link_warning_errno(link, r, "Failed to configure IPv6 Router Discovery: %m");