diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-05-05 11:26:17 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-05-08 08:02:49 +0200 |
| commit | d7dd4c70d0b218a5a490d18f419aabf99837e46f (patch) | |
| tree | c1161434a24b4ccd43fb6873c1fc8dc20002aa7d | |
| parent | 696fae40b78d8c4bf3dee675dd63e2e0a8f933b1 (diff) | |
| download | NetworkManager-d7dd4c70d0b218a5a490d18f419aabf99837e46f.tar.gz | |
libnm: adjust bridge defines NM_BRIDGE_HELLO_TIME_*
| -rw-r--r-- | libnm-core/nm-core-internal.h | 6 | ||||
| -rw-r--r-- | libnm-core/nm-setting-bridge.c | 8 | ||||
| -rw-r--r-- | src/devices/nm-device-bridge.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 1f56e17043..decd18f36d 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -78,8 +78,9 @@ #include "nm-libnm-core-intern/nm-libnm-core-utils.h" /* IEEE 802.1D-1998 timer values */ -#define NM_BR_MIN_HELLO_TIME 1 -#define NM_BR_MAX_HELLO_TIME 10 +#define NM_BRIDGE_HELLO_TIME_MIN 1u +#define NM_BRIDGE_HELLO_TIME_DEF 2u +#define NM_BRIDGE_HELLO_TIME_MAX 10u #define NM_BRIDGE_FORWARD_DELAY_MIN 2u #define NM_BRIDGE_FORWARD_DELAY_DEF 15u @@ -105,7 +106,6 @@ #define NM_BRIDGE_STP_DEF TRUE -#define BRIDGE_HELLO_TIME_DEFAULT 2 #define BRIDGE_MAX_AGE_DEFAULT 20 #define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT 2 #define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT 100 diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index c832a22a6f..7950a1d5fd 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -1208,8 +1208,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) return FALSE; if (!check_range (priv->hello_time, - NM_BR_MIN_HELLO_TIME, - NM_BR_MAX_HELLO_TIME, + NM_BRIDGE_HELLO_TIME_MIN, + NM_BRIDGE_HELLO_TIME_MAX, !priv->stp, NM_SETTING_BRIDGE_HELLO_TIME, error)) @@ -1571,7 +1571,7 @@ nm_setting_bridge_init (NMSettingBridge *setting) priv->ageing_time = NM_BRIDGE_AGEING_TIME_DEF; priv->forward_delay = NM_BRIDGE_FORWARD_DELAY_DEF; - priv->hello_time = BRIDGE_HELLO_TIME_DEFAULT; + priv->hello_time = NM_BRIDGE_HELLO_TIME_DEF; priv->max_age = BRIDGE_MAX_AGE_DEFAULT; priv->multicast_last_member_count = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT; priv->multicast_last_member_interval = BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT; @@ -1746,7 +1746,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass) */ obj_properties[PROP_HELLO_TIME] = g_param_spec_uint (NM_SETTING_BRIDGE_HELLO_TIME, "", "", - 0, NM_BR_MAX_HELLO_TIME, BRIDGE_HELLO_TIME_DEFAULT, + 0, NM_BRIDGE_HELLO_TIME_MAX, NM_BRIDGE_HELLO_TIME_DEF, G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c index fa8a406c82..784084cbd0 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -260,7 +260,7 @@ static const Option master_options[] = { TRUE, TRUE, TRUE}, { NM_SETTING_BRIDGE_HELLO_TIME, "hello_time", NULL, NULL, - 0, NM_BR_MAX_HELLO_TIME, 2, + NM_BRIDGE_HELLO_TIME_MIN, NM_BRIDGE_HELLO_TIME_MAX, NM_BRIDGE_HELLO_TIME_DEF, TRUE, TRUE, TRUE }, { NM_SETTING_BRIDGE_MAX_AGE, "max_age", NULL, NULL, |