From: Yu Watanabe Date: Wed, 26 Oct 2022 01:44:06 +0000 (+0900) Subject: network: drop redundant condition X-Git-Tag: v253-rc1~627^2~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=081466bd57cd441632e244292036f886ceac9112;p=thirdparty%2Fsystemd.git network: drop redundant condition The function `link_reconfigure_impl()` has the same condition at the beginning. --- diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 00e4e451ef3..e901c62fbff 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1537,15 +1537,12 @@ static int link_carrier_gained(Link *link) { force_reconfigure = link->previous_ssid && !streq_ptr(link->previous_ssid, link->ssid); link->previous_ssid = mfree(link->previous_ssid); - if (!IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - /* At this stage, both wlan and link information should be up-to-date. Hence, - * it is not necessary to call RTM_GETLINK, NL80211_CMD_GET_INTERFACE, or - * NL80211_CMD_GET_STATION commands, and simply call link_reconfigure_impl(). - * Note, link_reconfigure_impl() returns 1 when the link is reconfigured. */ - r = link_reconfigure_impl(link, force_reconfigure); - if (r != 0) - return r; - } + /* At this stage, both wlan and link information should be up-to-date. Hence, it is not necessary to + * call RTM_GETLINK, NL80211_CMD_GET_INTERFACE, or NL80211_CMD_GET_STATION commands, and simply call + * link_reconfigure_impl(). Note, link_reconfigure_impl() returns 1 when the link is reconfigured. */ + r = link_reconfigure_impl(link, force_reconfigure); + if (r != 0) + return r; r = link_handle_bound_by_list(link); if (r < 0)