diff options
| author | Franko Fang <fangxiaozhi@huawei.com> | 2013-04-03 13:12:43 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2013-04-09 18:41:14 +0200 |
| commit | d56a87a3bde4f504f828c050b905f20425c4c665 (patch) | |
| tree | b834999368a319ada0aa157041a5e6b260413715 | |
| parent | 9d4091cc89366e59a4e41b9f0212cce24d26127b (diff) | |
base-modem: keep AT port as possible data port if flagged as PPP
| -rw-r--r-- | src/mm-base-modem.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c index 6fee9ae0..622e4dfd 100644 --- a/src/mm-base-modem.c +++ b/src/mm-base-modem.c @@ -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); |