diff --git a/src/core/devices/wwan/libnm-wwan.ver b/src/core/devices/wwan/libnm-wwan.ver index 640df36dd8..488368c3ed 100644 --- a/src/core/devices/wwan/libnm-wwan.ver +++ b/src/core/devices/wwan/libnm-wwan.ver @@ -29,7 +29,7 @@ global: nm_modem_manager_name_owner_ref; nm_modem_manager_name_owner_unref; nm_modem_owns_port; - nm_modem_set_mm_enabled; + nm_modem_set_enabled; nm_modem_stage3_ip_config_start; nm_modem_state_to_string; nm_modem_unclaim; diff --git a/src/core/devices/wwan/nm-device-modem.c b/src/core/devices/wwan/nm-device-modem.c index 929bda15a7..a8a48ce6ab 100644 --- a/src/core/devices/wwan/nm-device-modem.c +++ b/src/core/devices/wwan/nm-device-modem.c @@ -277,7 +277,7 @@ modem_state_cb(NMModem *modem, int new_state_i, int old_state_i, gpointer user_d * to NetworkManager (eg something using MM's D-Bus API directly). */ - if (!NM_MODEM_GET_CLASS(priv->modem)->set_mm_enabled) { + if (!NM_MODEM_GET_CLASS(priv->modem)->set_enabled) { /* We cannot re-enable this modem, thus device becomes unavailable. */ nm_device_state_changed(device, NM_DEVICE_STATE_UNAVAILABLE, @@ -307,7 +307,7 @@ modem_state_cb(NMModem *modem, int new_state_i, int old_state_i, gpointer user_d /* If the modem is now unlocked, enable/disable it according to the * device's enabled/disabled state. */ - nm_modem_set_mm_enabled(priv->modem, priv->rf_enabled); + nm_modem_set_enabled(priv->modem, priv->rf_enabled); if (dev_state == NM_DEVICE_STATE_NEED_AUTH) { /* The modem was unlocked externally to NetworkManager, @@ -450,7 +450,7 @@ check_connection_available(NMDevice *device, return FALSE; } - if (!NM_MODEM_GET_CLASS(priv->modem)->set_mm_enabled && state <= NM_MODEM_STATE_DISABLING) { + if (!NM_MODEM_GET_CLASS(priv->modem)->set_enabled && state <= NM_MODEM_STATE_DISABLING) { nm_utils_error_set_literal(error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY, "modem is disabled and NM cannot enable it"); @@ -616,7 +616,7 @@ set_enabled(NMDevice *device, gboolean enabled) if (priv->modem) { /* Sync the ModemManager modem enabled/disabled with rfkill/user preference */ - nm_modem_set_mm_enabled(priv->modem, enabled); + nm_modem_set_enabled(priv->modem, enabled); } if (enabled == FALSE) { @@ -644,7 +644,7 @@ is_available(NMDevice *device, NMDeviceCheckDevAvailableFlags flags) if (modem_state <= NM_MODEM_STATE_INITIALIZING) return FALSE; - if (!NM_MODEM_GET_CLASS(priv->modem)->set_mm_enabled && modem_state <= NM_MODEM_STATE_DISABLING) + if (!NM_MODEM_GET_CLASS(priv->modem)->set_enabled && modem_state <= NM_MODEM_STATE_DISABLING) return FALSE; return TRUE; diff --git a/src/core/devices/wwan/nm-modem-broadband.c b/src/core/devices/wwan/nm-modem-broadband.c index 4bd0a45c51..de3a1f12c3 100644 --- a/src/core/devices/wwan/nm-modem-broadband.c +++ b/src/core/devices/wwan/nm-modem-broadband.c @@ -1698,7 +1698,7 @@ nm_modem_broadband_class_init(NMModemBroadbandClass *klass) modem_class->stage3_ip_config_start = stage3_ip_config_start; modem_class->disconnect = disconnect; modem_class->deactivate_cleanup = deactivate_cleanup; - modem_class->set_mm_enabled = set_mm_enabled; + modem_class->set_enabled = set_mm_enabled; modem_class->get_user_pass = get_user_pass; modem_class->check_connection_compatible_with_modem = check_connection_compatible_with_modem; modem_class->complete_connection = complete_connection; diff --git a/src/core/devices/wwan/nm-modem.c b/src/core/devices/wwan/nm-modem.c index 9d8f61c55c..0862167223 100644 --- a/src/core/devices/wwan/nm-modem.c +++ b/src/core/devices/wwan/nm-modem.c @@ -349,13 +349,13 @@ nm_modem_set_prev_state(NMModem *self, const char *reason) } void -nm_modem_set_mm_enabled(NMModem *self, gboolean enabled) +nm_modem_set_enabled(NMModem *self, gboolean enabled) { NMModemPrivate *priv = NM_MODEM_GET_PRIVATE(self); NMModemState prev_state = priv->state; - /* Not all modem classes support set_mm_enabled */ - if (!NM_MODEM_GET_CLASS(self)->set_mm_enabled) { + /* Not all modem classes support set_enabled */ + if (!NM_MODEM_GET_CLASS(self)->set_enabled) { _LOGD("cannot enable modem: not implemented"); return; } @@ -382,7 +382,7 @@ nm_modem_set_mm_enabled(NMModem *self, gboolean enabled) return; } - NM_MODEM_GET_CLASS(self)->set_mm_enabled(self, enabled); + NM_MODEM_GET_CLASS(self)->set_enabled(self, enabled); /* Pre-empt the state change signal */ nm_modem_set_state(self, diff --git a/src/core/devices/wwan/nm-modem.h b/src/core/devices/wwan/nm-modem.h index 1f54b0b69a..6900036099 100644 --- a/src/core/devices/wwan/nm-modem.h +++ b/src/core/devices/wwan/nm-modem.h @@ -126,7 +126,7 @@ typedef struct { void (*stage3_ip_config_start)(NMModem *self, int addr_family, NMModemIPMethod method); - void (*set_mm_enabled)(NMModem *self, gboolean enabled); + void (*set_enabled)(NMModem *self, gboolean enabled); void (*disconnect)(NMModem *self, gboolean warn, @@ -208,7 +208,7 @@ void nm_modem_deactivate_async(NMModem *self, void nm_modem_device_state_changed(NMModem *modem, NMDeviceState new_state, NMDeviceState old_state); -void nm_modem_set_mm_enabled(NMModem *self, gboolean enabled); +void nm_modem_set_enabled(NMModem *self, gboolean enabled); NMModemState nm_modem_get_state(NMModem *self); void nm_modem_set_state(NMModem *self, NMModemState new_state, const char *reason);