diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-03 11:50:49 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-03 11:50:55 +0200 |
| commit | 9598adac60b08d627aec324e63addacfe5e0ebd7 (patch) | |
| tree | 0a31db030a7e0413a4305aea7a02e3a7d01c0b4c | |
| parent | 605a575238e1513e092657472552930fd2f1db15 (diff) | |
| parent | 5354fe4e7f6c65966a64ef1c6794307d93efbe31 (diff) | |
| download | NetworkManager-9598adac60b08d627aec324e63addacfe5e0ebd7.tar.gz | |
cli,wwan: merge partial branch 'lr/gsm-default-apn'
Cherry-pick two patches from "lr/gsm-default-apn" and merge them to
master early.
Related: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/98
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 1 | ||||
| -rw-r--r-- | src/devices/wwan/nm-modem-broadband.c | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index ef8574a174..d509b7a7e9 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -5425,7 +5425,6 @@ static const NMMetaPropertyInfo *const property_infos_GSM[] = { PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_APN, .is_cli_option = TRUE, .property_alias = "apn", - .inf_flags = NM_META_PROPERTY_INF_FLAG_REQD, .prompt = N_("APN"), .property_type = &_pt_gobject_string, ), diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c index 1cb549b017..ffdc61a6b7 100644 --- a/src/devices/wwan/nm-modem-broadband.c +++ b/src/devices/wwan/nm-modem-broadband.c @@ -679,19 +679,6 @@ complete_connection (NMModem *_self, } if (MODEM_CAPS_3GPP (modem_caps)) { - NMSettingGsm *s_gsm; - - s_gsm = nm_connection_get_setting_gsm (connection); - if (!s_gsm) { - /* Need a GSM setting at least */ - g_set_error_literal (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_MISSING_SETTING, - _("GSM mobile broadband connection requires a 'gsm' setting")); - g_prefix_error (error, "%s: ", NM_SETTING_GSM_SETTING_NAME); - return FALSE; - } - nm_utils_complete_generic (NM_PLATFORM_GET, connection, NM_SETTING_GSM_SETTING_NAME, |