diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/huawei/mm-broadband-modem-huawei.c | 7 | ||||
| -rw-r--r-- | plugins/icera/mm-broadband-modem-icera.c | 9 | ||||
| -rw-r--r-- | plugins/linktop/mm-broadband-modem-linktop.c | 7 | ||||
| -rw-r--r-- | plugins/longcheer/mm-broadband-modem-longcheer.c | 7 | ||||
| -rw-r--r-- | plugins/option/mm-broadband-modem-option.c | 9 | ||||
| -rw-r--r-- | plugins/x22x/mm-broadband-modem-x22x.c | 7 | ||||
| -rw-r--r-- | plugins/zte/mm-broadband-modem-zte.c | 7 |
7 files changed, 2 insertions, 51 deletions
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c index 77441f43..5cac1fdc 100644 --- a/plugins/huawei/mm-broadband-modem-huawei.c +++ b/plugins/huawei/mm-broadband-modem-huawei.c @@ -646,13 +646,6 @@ set_allowed_modes (MMIfaceModem *self, user_data, set_allowed_modes); - /* There is no explicit config for CS connections, we just assume we may - * have them as part of 2G when no GPRS is available */ - if (allowed & MM_MODEM_MODE_CS) { - allowed |= MM_MODEM_MODE_2G; - allowed &= ~MM_MODEM_MODE_CS; - } - if (!allowed_mode_to_huawei (allowed, preferred, &mode, diff --git a/plugins/icera/mm-broadband-modem-icera.c b/plugins/icera/mm-broadband-modem-icera.c index 697e8cc6..e613f84c 100644 --- a/plugins/icera/mm-broadband-modem-icera.c +++ b/plugins/icera/mm-broadband-modem-icera.c @@ -113,7 +113,7 @@ modem_load_allowed_modes_finish (MMIfaceModem *self, *preferred = MM_MODEM_MODE_3G; return TRUE; case 5: /* any */ - *allowed = (MM_MODEM_MODE_CS | MM_MODEM_MODE_2G | MM_MODEM_MODE_3G); + *allowed = (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G); *preferred = MM_MODEM_MODE_NONE; return TRUE; default: @@ -185,13 +185,6 @@ modem_set_allowed_modes (MMIfaceModem *self, user_data, modem_set_allowed_modes); - /* There is no explicit config for CS connections, we just assume we may - * have them as part of 2G when no GPRS is available */ - if (allowed & MM_MODEM_MODE_CS) { - allowed |= MM_MODEM_MODE_2G; - allowed &= ~MM_MODEM_MODE_CS; - } - /* * The core has checked the following: * - that 'allowed' are a subset of the 'supported' modes diff --git a/plugins/linktop/mm-broadband-modem-linktop.c b/plugins/linktop/mm-broadband-modem-linktop.c index c34cf09a..49722819 100644 --- a/plugins/linktop/mm-broadband-modem-linktop.c +++ b/plugins/linktop/mm-broadband-modem-linktop.c @@ -153,13 +153,6 @@ set_allowed_modes (MMIfaceModem *self, user_data, set_allowed_modes); - /* There is no explicit config for CS connections, we just assume we may - * have them as part of 2G when no GPRS is available */ - if (allowed & MM_MODEM_MODE_CS) { - allowed |= MM_MODEM_MODE_2G; - allowed &= ~MM_MODEM_MODE_CS; - } - if (allowed == MM_MODEM_MODE_2G) linktop_mode = LINKTOP_MODE_2G; else if (allowed == MM_MODEM_MODE_3G) diff --git a/plugins/longcheer/mm-broadband-modem-longcheer.c b/plugins/longcheer/mm-broadband-modem-longcheer.c index 1e52c2ea..9734eb8f 100644 --- a/plugins/longcheer/mm-broadband-modem-longcheer.c +++ b/plugins/longcheer/mm-broadband-modem-longcheer.c @@ -148,13 +148,6 @@ set_allowed_modes (MMIfaceModem *self, user_data, set_allowed_modes); - /* There is no explicit config for CS connections, we just assume we may - * have them as part of 2G when no GPRS is available */ - if (allowed & MM_MODEM_MODE_CS) { - allowed |= MM_MODEM_MODE_2G; - allowed &= ~MM_MODEM_MODE_CS; - } - if (allowed == MM_MODEM_MODE_2G) mododr = 3; else if (allowed == MM_MODEM_MODE_3G) diff --git a/plugins/option/mm-broadband-modem-option.c b/plugins/option/mm-broadband-modem-option.c index 4acd16ac..274b2875 100644 --- a/plugins/option/mm-broadband-modem-option.c +++ b/plugins/option/mm-broadband-modem-option.c @@ -103,7 +103,7 @@ load_allowed_modes_finish (MMIfaceModem *self, *preferred = MM_MODEM_MODE_3G; return TRUE; case 5: /* any */ - *allowed = (MM_MODEM_MODE_CS | MM_MODEM_MODE_2G | MM_MODEM_MODE_3G); + *allowed = (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G); *preferred = MM_MODEM_MODE_NONE; return TRUE; default: @@ -175,13 +175,6 @@ set_allowed_modes (MMIfaceModem *self, user_data, set_allowed_modes); - /* There is no explicit config for CS connections, we just assume we may - * have them as part of 2G when no GPRS is available */ - if (allowed & MM_MODEM_MODE_CS) { - allowed |= MM_MODEM_MODE_2G; - allowed &= ~MM_MODEM_MODE_CS; - } - if (allowed == MM_MODEM_MODE_2G) option_mode = 0; else if (allowed == MM_MODEM_MODE_3G) diff --git a/plugins/x22x/mm-broadband-modem-x22x.c b/plugins/x22x/mm-broadband-modem-x22x.c index b7b16891..f61845a7 100644 --- a/plugins/x22x/mm-broadband-modem-x22x.c +++ b/plugins/x22x/mm-broadband-modem-x22x.c @@ -153,13 +153,6 @@ set_allowed_modes (MMIfaceModem *self, user_data, set_allowed_modes); - /* There is no explicit config for CS connections, we just assume we may - * have them as part of 2G when no GPRS is available */ - if (allowed & MM_MODEM_MODE_CS) { - allowed |= MM_MODEM_MODE_2G; - allowed &= ~MM_MODEM_MODE_CS; - } - if (allowed == MM_MODEM_MODE_2G) syssel = 1; else if (allowed == MM_MODEM_MODE_3G) diff --git a/plugins/zte/mm-broadband-modem-zte.c b/plugins/zte/mm-broadband-modem-zte.c index dc0898e9..e9bc99f0 100644 --- a/plugins/zte/mm-broadband-modem-zte.c +++ b/plugins/zte/mm-broadband-modem-zte.c @@ -318,13 +318,6 @@ set_allowed_modes (MMIfaceModem *self, user_data, set_allowed_modes); - /* There is no explicit config for CS connections, we just assume we may - * have them as part of 2G when no GPRS is available */ - if (allowed & MM_MODEM_MODE_CS) { - allowed |= MM_MODEM_MODE_2G; - allowed &= ~MM_MODEM_MODE_CS; - } - if (allowed == MM_MODEM_MODE_2G) { cm_mode = 1; pref_acq = 0; |