fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-28 07:40:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

modem: don't warn if disconnect fails when the modem already failed

Browse source 
The disconnect request gets sent just as a precaution, but usually when
the device fails the modem is already gone from ModemManager and the
Disconnect() method will fail.  Just don't log the failure.
This commit is contained in:
Dan Williams 2012-06-04 15:47:20 -05:00
parent 716a09d7ac
commit 5751a7909b
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/modem-manager/nm-modem.c
View file

@ -614,8 +614,9 @@ static void
disconnect_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
{
GError *error = NULL;
gboolean warn = GPOINTER_TO_UINT (user_data);
if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) {
if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID) && warn) {
nm_log_info (LOGD_MB, "disconnect failed: (%d) %s",
error ? error->code : -1,
error && error->message ? error->message : "(unknown)");
@ -628,7 +629,7 @@ nm_modem_device_state_changed (NMModem *self,
NMDeviceState old_state,
NMDeviceStateReason reason)
{
gboolean was_connected = FALSE;
gboolean was_connected = FALSE, warn = TRUE;
NMModemPrivate *priv;
g_return_if_fail (self != NULL);
@ -658,10 +659,13 @@ nm_modem_device_state_changed (NMModem *self,
}
if (was_connected) {
/* Don't bother warning on FAILED since the modem is already gone */
if (new_state == NM_DEVICE_STATE_FAILED)
warn = FALSE;
dbus_g_proxy_begin_call (nm_modem_get_proxy (self, MM_DBUS_INTERFACE_MODEM),
"Disconnect",
disconnect_done,
self,
GUINT_TO_POINTER (warn),
NULL,
G_TYPE_INVALID);
}