system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-09-06 17:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli,wwan: merge partial branch 'lr/gsm-default-apn'

Browse source 
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
This commit is contained in:
Thomas Haller 2019-04-03 11:50:49 +02:00
parent 605a575238 5354fe4e7f
commit 9598adac60
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clients/common/nm-meta-setting-desc.c
View file

@ -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,
),

13
src/devices/wwan/nm-modem-broadband.c
View file

@ -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,