diff options
| author | Francesco Giudici <fgiudici@redhat.com> | 2018-01-15 18:28:04 +0100 |
|---|---|---|
| committer | Francesco Giudici <fgiudici@redhat.com> | 2018-01-15 18:28:04 +0100 |
| commit | 345d34b36995103ca173f1a3ff07d02400c5d5f6 (patch) | |
| tree | e5c6a7c246de1a44c912489cdb26d563eee617c4 | |
| parent | 929f36c56f3b22a917066c5cb7bfc938630f9e8c (diff) | |
| parent | 2c99eba42fdd69c7e5719f19d24aa944dfaaf666 (diff) | |
| download | NetworkManager-345d34b36995103ca173f1a3ff07d02400c5d5f6.tar.gz | |
team: merge branch 'fg/team_sys_prio_default-rh1533810'
https://bugzilla.redhat.com/show_bug.cgi?id=1533810
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 8 | ||||
| -rw-r--r-- | libnm-core/nm-setting-team.h | 2 | ||||
| -rw-r--r-- | libnm-core/nm-utils.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index a028c9a3fa..8e46b336af 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -6625,7 +6625,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = { .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, .value_infos = INT_VALUE_INFOS ( { - .value = 50, + .value = NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT, .nick = "default", } ), @@ -6642,7 +6642,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = { .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, .value_infos = INT_VALUE_INFOS ( { - .value = 255, + .value = NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT, .nick = "default", } ), @@ -6698,7 +6698,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = { .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, .value_infos = INT_VALUE_INFOS ( { - .value = -1, + .value = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT, .nick = "default", } ), @@ -6723,7 +6723,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = { .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, .value_infos = INT_VALUE_INFOS ( { - .value = 255, + .value = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT, .nick = "default", } ), diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h index e614faf531..f5e1290cd1 100644 --- a/libnm-core/nm-setting-team.h +++ b/libnm-core/nm-setting-team.h @@ -150,7 +150,7 @@ NMTeamLinkWatcherArpPingFlags nm_team_link_watcher_get_flags (NMTeamLinkWatcher #define NM_SETTING_TEAM_RUNNER_DEFAULT NM_SETTING_TEAM_RUNNER_ROUNDROBIN #define NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_DEFAULT NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_SAME_ALL #define NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT 50 -#define NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT 255 +#define NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT 65535 #define NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_DEFAULT NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index dbb7a99919..61f0733d3f 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -5171,9 +5171,9 @@ _json_team_normalize_defaults (json_t *json, gboolean reset) _json_delete_object_on_string_match (json, "runner", "hwaddr_policy", NULL, NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_DEFAULT); } else if (nm_streq (runner, NM_SETTING_TEAM_RUNNER_LACP)) { - runner_tx_balancer_interval = 50; + runner_tx_balancer_interval = NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT; runner_active = TRUE; - runner_sys_prio = 255; + runner_sys_prio = NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT; runner_min_ports = 0; _json_delete_object_on_string_match (json, "runner", "agg_select_policy", NULL, NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_DEFAULT); |