fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 22:10:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'fm/1354-assert-modem-device'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1726
This commit is contained in:
Beniamino Galvani 2023-09-25 08:49:34 +00:00
commit 867db80457
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/devices/wwan/nm-device-modem.c
View file

@ -70,14 +70,17 @@ ppp_failed(NMModem *modem, guint i_reason, gpointer user_data)
static void
modem_prepare_result(NMModem *modem, gboolean success, guint i_reason, gpointer user_data)
{
NMDeviceModem *self = NM_DEVICE_MODEM(user_data);
NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE(self);
NMDevice *device = NM_DEVICE(self);
NMDeviceStateReason reason = i_reason;
NMDeviceModem *self = NM_DEVICE_MODEM(user_data);
NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE(self);
NMDevice *device = NM_DEVICE(self);
NMDeviceStateReason reason = i_reason;
NMDeviceState device_state = nm_device_get_state(device);
if (nm_device_get_state(device) != NM_DEVICE_STATE_PREPARE
if (device_state != NM_DEVICE_STATE_PREPARE
|| priv->stage1_state != NM_DEVICE_STAGE_STATE_PENDING) {
nm_assert_not_reached();
_LOGD(LOGD_MB,
"device no longer in prepare state when modem prepare finished ('%s')",
nm_device_state_to_string(device_state));
success = FALSE;
}