From 8ee4dbf7090dc0fd4ae07abb1bd447d698abd37e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 5 May 2020 10:49:58 +0200 Subject: [PATCH] libnm: adjust bridge defines NM_BRIDGE_FORWARD_DELAY_* --- libnm-core/nm-core-internal.h | 6 +++--- libnm-core/nm-setting-bridge.c | 8 ++++---- 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 815510360a..1667159784 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -81,8 +81,9 @@ #define NM_BR_MIN_HELLO_TIME 1 #define NM_BR_MAX_HELLO_TIME 10 -#define NM_BR_MIN_FORWARD_DELAY 2 -#define NM_BR_MAX_FORWARD_DELAY 30 +#define NM_BRIDGE_FORWARD_DELAY_MIN 2u +#define NM_BRIDGE_FORWARD_DELAY_DEF 15u +#define NM_BRIDGE_FORWARD_DELAY_MAX 30u #define NM_BR_MIN_MAX_AGE 6 #define NM_BR_MAX_MAX_AGE 40 @@ -102,7 +103,6 @@ #define NM_BRIDGE_MULTICAST_HASH_MAX_DEF 4096u #define NM_BRIDGE_MULTICAST_HASH_MAX_MAX ((guint) G_MAXUINT32) -#define BRIDGE_FORWARD_DELAY_DEFAULT 15 #define BRIDGE_HELLO_TIME_DEFAULT 2 #define BRIDGE_MAX_AGE_DEFAULT 20 #define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT 2 diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index 7898369ebd..1302eb9985 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -1200,8 +1200,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } if (!check_range (priv->forward_delay, - NM_BR_MIN_FORWARD_DELAY, - NM_BR_MAX_FORWARD_DELAY, + NM_BRIDGE_FORWARD_DELAY_MIN, + NM_BRIDGE_FORWARD_DELAY_MAX, !priv->stp, NM_SETTING_BRIDGE_FORWARD_DELAY, error)) @@ -1570,7 +1570,7 @@ nm_setting_bridge_init (NMSettingBridge *setting) priv->vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref); priv->ageing_time = NM_BRIDGE_AGEING_TIME_DEF; - priv->forward_delay = BRIDGE_FORWARD_DELAY_DEFAULT; + priv->forward_delay = NM_BRIDGE_FORWARD_DELAY_DEF; priv->hello_time = BRIDGE_HELLO_TIME_DEFAULT; priv->max_age = BRIDGE_MAX_AGE_DEFAULT; priv->multicast_last_member_count = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT; @@ -1726,7 +1726,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass) */ obj_properties[PROP_FORWARD_DELAY] = g_param_spec_uint (NM_SETTING_BRIDGE_FORWARD_DELAY, "", "", - 0, NM_BR_MAX_FORWARD_DELAY, BRIDGE_FORWARD_DELAY_DEFAULT, + 0, NM_BRIDGE_FORWARD_DELAY_MAX, NM_BRIDGE_FORWARD_DELAY_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 1f71aa8395..23a373d3aa 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -256,7 +256,7 @@ static const Option master_options[] = { TRUE, FALSE, TRUE }, { NM_SETTING_BRIDGE_FORWARD_DELAY, "forward_delay", NULL, NULL, - 0, NM_BR_MAX_FORWARD_DELAY, 15, + NM_BRIDGE_FORWARD_DELAY_MIN, NM_BRIDGE_FORWARD_DELAY_MAX, NM_BRIDGE_FORWARD_DELAY_DEF, TRUE, TRUE, TRUE}, { NM_SETTING_BRIDGE_HELLO_TIME, "hello_time", NULL, NULL,