fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 07:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: add nm_device_bring_up_full()

Browse source 
In the next commit nm_device_bring_up() will be extended with a new
argument. Most callers just want to bring up the device synchronously
and don't care about the "no_firmware" argument. Introduce a
nm_device_bring_up_full() for callers that need special behavior.

(cherry picked from commit 861934a510)
This commit is contained in:
Beniamino Galvani 2022-11-14 16:50:21 +01:00
parent fb6e1ec549
commit 738e41cd3e
11 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/devices/nm-device-bond.c
View file

@ -492,7 +492,7 @@ act_stage1_prepare(NMDevice *device, NMDeviceStateReason *out_failure_reason)
/* This is a workaround because netlink do not support ifname as primary */
set_bond_attr_or_default(device, s_bond, NM_SETTING_BOND_OPTION_PRIMARY);
nm_device_bring_up(device, TRUE, NULL);
nm_device_bring_up(device);
return ret;
}
@ -540,7 +540,7 @@ attach_port(NMDevice *device,
success = nm_platform_link_enslave(nm_device_get_platform(device),
nm_device_get_ip_ifindex(device),
nm_device_get_ip_ifindex(port));
nm_device_bring_up(port, TRUE, NULL);
nm_device_bring_up(port);
if (!success) {
_LOGI(LOGD_BOND, "attaching bond port %s: failed", nm_device_get_ip_iface(port));
@ -613,7 +613,7 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure)
* other state is noticed by the now-released slave.
*/
if (ifindex_slave > 0) {
if (!nm_device_bring_up(port, TRUE, NULL))
if (!nm_device_bring_up(port))
_LOGW(LOGD_BOND, "detached bond port could not be brought up.");
}
} else {

2
src/core/devices/nm-device-infiniband.c
View file

@ -89,7 +89,7 @@ act_stage1_prepare(NMDevice *device, NMDeviceStateReason *out_failure_reason)
ok = nm_platform_sysctl_set(nm_device_get_platform(device),
NMP_SYSCTL_PATHID_NETDIR(dirfd, ifname_verified, "mode"),
transport_mode);
nm_device_bring_up(device, TRUE, NULL);
nm_device_bring_up(device);
if (!ok) {
NM_SET_OUT(out_failure_reason, NM_DEVICE_STATE_REASON_CONFIG_FAILED);

2
src/core/devices/nm-device-macsec.c
View file

@ -402,7 +402,7 @@ supplicant_iface_state_is_completed(NMDeviceMacsec *self, NMSupplicantInterfaceS
nm_clear_g_source(&priv->supplicant.lnk_timeout_id);
nm_clear_g_source(&priv->supplicant.con_timeout_id);
nm_device_bring_up(NM_DEVICE(self), TRUE, NULL);
nm_device_bring_up(NM_DEVICE(self));
/* If this is the initial association during device activation,
* schedule the next activation stage.

3
src/core/devices/nm-device-private.h
View file

@ -37,7 +37,8 @@ gboolean nm_device_set_ip_ifindex(NMDevice *self, int ifindex);
gboolean nm_device_set_ip_iface(NMDevice *self, const char *iface);
gboolean nm_device_bring_up(NMDevice *self, gboolean wait, gboolean *no_firmware);
gboolean nm_device_bring_up(NMDevice *self);
gboolean nm_device_bring_up_full(NMDevice *self, gboolean block, gboolean *no_firmware);
void nm_device_take_down(NMDevice *self, gboolean block);

2
src/core/devices/nm-device-vrf.c
View file

@ -226,7 +226,7 @@ attach_port(NMDevice *device,
success = nm_platform_link_enslave(nm_device_get_platform(device),
nm_device_get_ip_ifindex(device),
nm_device_get_ip_ifindex(port));
nm_device_bring_up(port, TRUE, NULL);
nm_device_bring_up(port);
if (!success)
return FALSE;

4
src/core/devices/nm-device-wpan.c
View file

@ -176,10 +176,10 @@ act_stage1_prepare(NMDevice *device, NMDeviceStateReason *out_failure_reason)
ret = NM_ACT_STAGE_RETURN_SUCCESS;
out:
nm_device_bring_up(device, TRUE, NULL);
nm_device_bring_up(device);
if (lowpan_device)
nm_device_bring_up(lowpan_device, TRUE, NULL);
nm_device_bring_up(lowpan_device);
return ret;
}

16
src/core/devices/nm-device.c
View file

@ -6828,7 +6828,7 @@ device_link_changed(gpointer user_data)
* bring it up probably has failed because of the
* invalid hardware address; try again.
*/
nm_device_bring_up(self, TRUE, NULL);
nm_device_bring_up(self);
nm_device_queue_recheck_available(self,
NM_DEVICE_STATE_REASON_NONE,
NM_DEVICE_STATE_REASON_NONE);
@ -9719,7 +9719,7 @@ activate_stage2_device_config(NMDevice *self)
_routing_rules_sync(self, NM_TERNARY_TRUE);
if (!nm_device_sys_iface_state_is_external_or_assume(self)) {
if (!nm_device_bring_up(self, FALSE, &no_firmware)) {
if (!nm_device_bring_up_full(self, FALSE, &no_firmware)) {
nm_device_state_changed(self,
NM_DEVICE_STATE_FAILED,
no_firmware ? NM_DEVICE_STATE_REASON_FIRMWARE_MISSING
@ -13994,7 +13994,7 @@ carrier_detect_wait(NMDevice *self)
}
gboolean
nm_device_bring_up(NMDevice *self, gboolean block, gboolean *no_firmware)
nm_device_bring_up_full(NMDevice *self, gboolean block, gboolean *no_firmware)
{
gboolean device_is_up = FALSE;
NMDeviceCapabilities capabilities;
@ -14061,6 +14061,12 @@ nm_device_bring_up(NMDevice *self, gboolean block, gboolean *no_firmware)
return TRUE;
}
gboolean
nm_device_bring_up(NMDevice *self)
{
return nm_device_bring_up_full(self, TRUE, NULL);
}
void
nm_device_take_down(NMDevice *self, gboolean block)
{
@ -15814,7 +15820,7 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
if (priv->sys_iface_state == NM_DEVICE_SYS_IFACE_STATE_MANAGED) {
if (old_state == NM_DEVICE_STATE_UNMANAGED || priv->firmware_missing) {
if (!nm_device_bring_up(self, TRUE, &no_firmware) && no_firmware)
if (!nm_device_bring_up_full(self, TRUE, &no_firmware) && no_firmware)
_LOGW(LOGD_PLATFORM, "firmware may be missing.");
nm_device_set_firmware_missing(self, no_firmware ? TRUE : FALSE);
}
@ -16574,7 +16580,7 @@ handle_fail:
}
if (was_taken_down) {
if (!nm_device_bring_up(self, TRUE, NULL))
if (!nm_device_bring_up(self))
return FALSE;
}

2
src/core/devices/ovs/nm-device-ovs-interface.c
View file

@ -132,7 +132,7 @@ link_changed(NMDevice *device, const NMPlatformLink *pllink)
nm_device_devip_set_failed(device, AF_INET6, NM_DEVICE_STATE_REASON_CONFIG_FAILED);
return;
}
nm_device_bring_up(device, TRUE, NULL);
nm_device_bring_up(device);
nm_device_devip_set_state(device, AF_INET, NM_DEVICE_IP_STATE_PENDING, NULL);
nm_device_devip_set_state(device, AF_INET6, NM_DEVICE_IP_STATE_PENDING, NULL);

4
src/core/devices/team/nm-device-team.c
View file

@ -884,7 +884,7 @@ attach_port(NMDevice *device,
success = nm_platform_link_enslave(nm_device_get_platform(device),
nm_device_get_ip_ifindex(device),
nm_device_get_ip_ifindex(port));
nm_device_bring_up(port, TRUE, NULL);
nm_device_bring_up(port);
if (!success)
return FALSE;
@ -934,7 +934,7 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure)
* IFF_UP), so we must bring it back up here to ensure carrier changes and
* other state is noticed by the now-released port.
*/
if (!nm_device_bring_up(port, TRUE, NULL)) {
if (!nm_device_bring_up(port)) {
_LOGW(LOGD_TEAM, "detached team port %s could not be brought up", port_iface);
}

2
src/core/devices/wifi/nm-device-olpc-mesh.c
View file

@ -198,7 +198,7 @@ act_stage2_config(NMDevice *device, NMDeviceStateReason *out_failure_reason)
nm_device_get_ifindex(device),
g_bytes_get_data(ssid, NULL),
g_bytes_get_size(ssid));
nm_device_bring_up(NM_DEVICE(self), TRUE, NULL);
nm_device_bring_up(NM_DEVICE(self));
if (!success) {
_LOGW(LOGD_WIFI, "Unable to set the mesh ID");
return NM_ACT_STAGE_RETURN_FAILURE;

4
src/core/devices/wifi/nm-device-wifi.c
View file

@ -960,7 +960,7 @@ deactivate(NMDevice *device)
!= _NM_802_11_MODE_INFRA) {
nm_device_take_down(NM_DEVICE(self), TRUE);
nm_platform_wifi_set_mode(nm_device_get_platform(device), ifindex, _NM_802_11_MODE_INFRA);
nm_device_bring_up(NM_DEVICE(self), TRUE, NULL);
nm_device_bring_up(NM_DEVICE(self));
}
if (priv->mode != _NM_802_11_MODE_INFRA) {
@ -3586,7 +3586,7 @@ set_enabled(NMDevice *device, gboolean enabled)
if (state != NM_DEVICE_STATE_UNAVAILABLE)
_LOGW(LOGD_CORE, "not in expected unavailable state!");
if (!nm_device_bring_up(NM_DEVICE(self), TRUE, &no_firmware)) {
if (!nm_device_bring_up_full(NM_DEVICE(self), TRUE, &no_firmware)) {
_LOGD(LOGD_WIFI, "enable blocked by failure to bring device up");
if (no_firmware)