fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 05:18:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi/trivial: rename function nm_supplicant_interface_state_is_operational() from upper case name

Browse source
This commit is contained in:
Thomas Haller 2020-04-01 11:56:21 +02:00
parent 80e7e8845a
commit b10c382b1d
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/devices/nm-device-ethernet.c
View file

@ -811,7 +811,7 @@ supplicant_connection_timeout_cb (gpointer user_data)
state = nm_supplicant_interface_get_state (priv->supplicant.iface);
if (state != NM_SUPPLICANT_INTERFACE_STATE_COMPLETED
&& NM_SUPPLICANT_INTERFACE_STATE_IS_OPERATIONAL (state))
&& nm_supplicant_interface_state_is_operational (state))
priv->supplicant.lnk_timeout_id = g_timeout_add_seconds (SUPPLICANT_LNK_TIMEOUT_SEC, supplicant_lnk_timeout_cb, self);
}
@ -862,7 +862,7 @@ supplicant_interface_create_cb (NMSupplicantManager *supplicant_manager,
supplicant_connection_timeout_cb,
self);
if (NM_SUPPLICANT_INTERFACE_STATE_IS_OPERATIONAL (nm_supplicant_interface_get_state (iface)))
if (nm_supplicant_interface_state_is_operational (nm_supplicant_interface_get_state (iface)))
supplicant_iface_start (self);
}

4
src/devices/nm-device-macsec.c
View file

@ -584,7 +584,7 @@ supplicant_connection_timeout_cb (gpointer user_data)
state = nm_supplicant_interface_get_state (priv->supplicant.iface);
if (state != NM_SUPPLICANT_INTERFACE_STATE_COMPLETED
&& NM_SUPPLICANT_INTERFACE_STATE_IS_OPERATIONAL (state))
&& nm_supplicant_interface_state_is_operational (state))
priv->supplicant.lnk_timeout_id = g_timeout_add_seconds (SUPPLICANT_LNK_TIMEOUT_SEC, supplicant_lnk_timeout_cb, self);
}
@ -636,7 +636,7 @@ supplicant_interface_create_cb (NMSupplicantManager *supplicant_manager,
supplicant_connection_timeout_cb,
self);
if (NM_SUPPLICANT_INTERFACE_STATE_IS_OPERATIONAL (nm_supplicant_interface_get_state (iface)))
if (nm_supplicant_interface_state_is_operational (nm_supplicant_interface_get_state (iface)))
supplicant_iface_start (self);
}

8
src/devices/wifi/nm-device-wifi-p2p.c
View file

@ -228,7 +228,7 @@ is_available (NMDevice *device, NMDeviceCheckDevAvailableFlags flags)
return FALSE;
supplicant_state = nm_supplicant_interface_get_state (priv->mgmt_iface);
return NM_SUPPLICANT_INTERFACE_STATE_IS_OPERATIONAL (supplicant_state);
return nm_supplicant_interface_state_is_operational (supplicant_state);
}
static gboolean
@ -712,7 +712,7 @@ check_group_iface_ready (NMDeviceWifiP2P *self)
if (!priv->group_iface)
return;
if (!NM_SUPPLICANT_INTERFACE_STATE_IS_OPERATIONAL (nm_supplicant_interface_get_state (priv->group_iface)))
if (!nm_supplicant_interface_state_is_operational (nm_supplicant_interface_get_state (priv->group_iface)))
return;
if (!nm_supplicant_interface_get_p2p_group_joined (priv->group_iface))
@ -910,7 +910,7 @@ device_state_changed (NMDevice *device,
break;
case NM_DEVICE_STATE_UNAVAILABLE:
if ( !priv->mgmt_iface
|| !NM_SUPPLICANT_INTERFACE_STATE_IS_OPERATIONAL (nm_supplicant_interface_get_state (priv->mgmt_iface)))
|| !nm_supplicant_interface_state_is_operational (nm_supplicant_interface_get_state (priv->mgmt_iface)))
_set_is_waiting_for_supplicant (self, TRUE);
break;
case NM_DEVICE_STATE_NEED_AUTH:
@ -1080,7 +1080,7 @@ done:
NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED);
_set_is_waiting_for_supplicant (self,
!priv->mgmt_iface
|| !NM_SUPPLICANT_INTERFACE_STATE_IS_OPERATIONAL (nm_supplicant_interface_get_state (priv->mgmt_iface)));
|| !nm_supplicant_interface_state_is_operational (nm_supplicant_interface_get_state (priv->mgmt_iface)));
}
void

6
src/supplicant/nm-supplicant-interface.c
View file

@ -443,7 +443,7 @@ _notify_maybe_scanning (NMSupplicantInterface *self)
NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
gboolean scanning;
scanning = NM_SUPPLICANT_INTERFACE_STATE_IS_OPERATIONAL (priv->state)
scanning = nm_supplicant_interface_state_is_operational (priv->state)
&& ( priv->scanning_property
|| priv->supp_state == NM_SUPPLICANT_INTERFACE_STATE_SCANNING);
@ -1115,7 +1115,7 @@ set_state (NMSupplicantInterface *self, NMSupplicantInterfaceState new_state)
nm_assert (new_state > NM_SUPPLICANT_INTERFACE_STATE_STARTING);
nm_assert (new_state < NM_SUPPLICANT_INTERFACE_STATE_DOWN);
nm_assert (NM_SUPPLICANT_INTERFACE_STATE_IS_OPERATIONAL (new_state));
nm_assert (nm_supplicant_interface_state_is_operational (new_state));
nm_assert (priv->state >= NM_SUPPLICANT_INTERFACE_STATE_STARTING);
nm_assert (priv->state < NM_SUPPLICANT_INTERFACE_STATE_DOWN);
@ -1237,7 +1237,7 @@ _starting_check_ready (NMSupplicantInterface *self)
nm_assert (priv->state == NM_SUPPLICANT_INTERFACE_STATE_STARTING);
if (!NM_SUPPLICANT_INTERFACE_STATE_IS_OPERATIONAL (priv->supp_state)) {
if (!nm_supplicant_interface_state_is_operational (priv->supp_state)) {
_LOGW ("Supplicant state is unknown during initialization. Destroy the interface");
set_state_down (self, TRUE, "failure to get valid interface state");
return;

2
src/supplicant/nm-supplicant-interface.h
View file

@ -35,7 +35,7 @@ typedef enum {
} NMSupplicantInterfaceState;
static inline gboolean
NM_SUPPLICANT_INTERFACE_STATE_IS_OPERATIONAL (NMSupplicantInterfaceState state)
nm_supplicant_interface_state_is_operational (NMSupplicantInterfaceState state)
{
return state > NM_SUPPLICANT_INTERFACE_STATE_STARTING
&& state < NM_SUPPLICANT_INTERFACE_STATE_DOWN;