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

base-modem: keep AT port as possible data port if flagged as PPP

Browse Source
This commit is contained in:
Franko Fang
2013-04-09 18:41:14 +02:00
committed by Aleksander Morgado
parent 9d4091cc89
commit d56a87a3bd
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-base-modem.c
+12 -4
View File
@@ -891,8 +891,12 @@ mm_base_modem_organize_ports (MMBaseModem *self,
}
}
if (!data_primary && (flags & MM_AT_PORT_FLAG_PPP))
data_primary = candidate;
if (flags & MM_AT_PORT_FLAG_PPP) {
if (!data_primary)
data_primary = candidate;
else
data = g_list_append (data, candidate);
}
/* Explicitly flagged secondary ports trump NONE ports for secondary */
if (flags & MM_AT_PORT_FLAG_SECONDARY) {
@@ -921,9 +925,13 @@ mm_base_modem_organize_ports (MMBaseModem *self,
break;
case MM_PORT_TYPE_NET:
/* Net device (if any) is the preferred data port */
if (!data_primary || MM_IS_AT_SERIAL_PORT (data_primary))
if (!data_primary)
data_primary = candidate;
else if (MM_IS_AT_SERIAL_PORT (data_primary)) {
/* Net device (if any) is the preferred data port */
data = g_list_append (data, data_primary);
data_primary = candidate;
}
else
/* All non-primary net ports get added to the list of data ports */
data = g_list_append (data, candidate);