SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gsm: ensure PDP context deactivation happens on disconnect

Browse Source 
The port is still connected until disconnect_done() runs, but by
this point we already know it's been disconnected so it's safe to
run the CGACT commands.
This commit is contained in:
Dan Williams
2010-03-10 16:30:58 -08:00
parent 8f50dd3191
commit 13bc593a29
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-generic-gsm.c
+9 -3
View File
@@ -1966,13 +1966,19 @@ disconnect_flash_done (MMSerialPort *port,
char *command;
info->error = mm_modem_check_removed (info->modem, error);
if (info->error) {
/* Ignore NO_CARRIER errors and proceed with the PDP context deactivation */
if ( info->error
&& !g_error_matches (info->error,
MM_MODEM_CONNECT_ERROR,
MM_MODEM_CONNECT_ERROR_NO_CARRIER)) {
mm_callback_info_schedule (info);
return;
}
/* Disconnect the PDP context */
priv = MM_GENERIC_GSM_GET_PRIVATE (info->modem);
mm_port_set_connected (priv->data, FALSE);
/* Disconnect the PDP context */
if (priv->cid >= 0)
command = g_strdup_printf ("+CGACT=0,%d", priv->cid);
else {
@@ -1980,7 +1986,7 @@ disconnect_flash_done (MMSerialPort *port,
command = g_strdup_printf ("+CGACT=0");
}
mm_serial_port_queue_command (port, command, 60, disconnect_cgact_done, info);
mm_serial_port_queue_command (port, command, 3, disconnect_cgact_done, info);
g_free (command);
}