summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Giudici <fgiudici@redhat.com>2016-11-11 13:16:05 +0100
committerFrancesco Giudici <fgiudici@redhat.com>2016-11-22 15:24:47 +0100
commite196137f3a8eca16fec4d67c0318932924171084 (patch)
tree842ad9e1ebe72350358033e8717238dcff964c7c
parent12b9d30ae625000c578d6b4f4bcf8c3a119132dc (diff)
downloadNetworkManager-e196137f3a8eca16fec4d67c0318932924171084.tar.gz
nmcli: enable set on 802-3 properties
-rw-r--r--clients/cli/settings.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 89d779798d..d1e3ded932 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -4996,10 +4996,10 @@ DEFINE_REMOVER_OPTION (nmc_property_vpn_remove_option_secret,
/* --- NM_SETTING_WIRED_SETTING_NAME property setter functions --- */
#if 0
-/*
- * Do not allow setting 'port' and 'duplex' for now. They are not implemented in
- * NM core, nor in ifcfg-rh plugin. Enable this when it gets done.
- */
+-/*
+- * Do not allow setting 'port' for now. It is not implemented in
+- * NM core, nor in ifcfg-rh plugin. Enable this when it gets done.
+- */
/* 'port' */
static const char *wired_valid_ports[] = { "tp", "aui", "bnc", "mii", NULL };
@@ -5010,6 +5010,7 @@ nmc_property_wired_set_port (NMSetting *setting, const char *prop, const char *v
}
DEFINE_ALLOWED_VAL_FUNC (nmc_property_wired_allowed_port, wired_valid_ports)
+#endif
/* 'duplex' */
static const char *wired_valid_duplexes[] = { "half", "full", NULL };
@@ -5021,7 +5022,7 @@ nmc_property_wired_set_duplex (NMSetting *setting, const char *prop, const char
}
DEFINE_ALLOWED_VAL_FUNC (nmc_property_wired_allowed_duplex, wired_valid_duplexes)
-#endif
+
/* 'mac-address-blacklist' */
DEFINE_SETTER_MAC_BLACKLIST (nmc_property_wired_set_mac_address_blacklist,
@@ -7310,28 +7311,28 @@ nmc_properties_init (void)
/* Add editable properties for NM_SETTING_WIRED_SETTING_NAME */
nmc_add_prop_funcs (GLUE (WIRED, PORT),
nmc_property_wired_get_port,
- NULL, /*nmc_property_wired_set_port,*/
+ NULL, /* nmc_property_wired_set_port, */
NULL,
NULL,
- NULL, /*nmc_property_wired_allowed_port,*/
+ NULL, /* nmc_property_wired_allowed_port, */
NULL);
nmc_add_prop_funcs (GLUE (WIRED, SPEED),
nmc_property_wired_get_speed,
- NULL,
+ nmc_property_set_uint,
NULL,
NULL,
NULL,
NULL);
nmc_add_prop_funcs (GLUE (WIRED, DUPLEX),
nmc_property_wired_get_duplex,
- NULL, /*nmc_property_wired_set_duplex,*/
- NULL,
+ nmc_property_wired_set_duplex,
NULL,
NULL,
- NULL); /*nmc_property_wired_allowed_duplex);*/
+ nmc_property_wired_allowed_duplex,
+ NULL);
nmc_add_prop_funcs (GLUE (WIRED, AUTO_NEGOTIATE),
nmc_property_wired_get_auto_negotiate,
- NULL,
+ nmc_property_set_bool,
NULL,
NULL,
NULL,