From e2cb0837cc572cab3fc032ff2fb6078fc0a3d8db Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 5 May 2020 11:45:27 +0200 Subject: [PATCH] libnm: adjust bridge defines NM_BRIDGE_MAX_AGE_* --- 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 decd18f36d..8cea7e44c7 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -86,8 +86,9 @@ #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 +#define NM_BRIDGE_MAX_AGE_MIN 6u +#define NM_BRIDGE_MAX_AGE_DEF 20u +#define NM_BRIDGE_MAX_AGE_MAX 40u /* IEEE 802.1D-1998 Table 7.4 */ #define NM_BRIDGE_AGEING_TIME_MIN 0u @@ -106,7 +107,6 @@ #define NM_BRIDGE_STP_DEF TRUE -#define BRIDGE_MAX_AGE_DEFAULT 20 #define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT 2 #define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT 100 #define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT 26000 diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index 7950a1d5fd..ced8b5bdb7 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -1216,8 +1216,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) return FALSE; if (!check_range (priv->max_age, - NM_BR_MIN_MAX_AGE, - NM_BR_MAX_MAX_AGE, + NM_BRIDGE_MAX_AGE_MIN, + NM_BRIDGE_MAX_AGE_MAX, !priv->stp, NM_SETTING_BRIDGE_MAX_AGE, error)) @@ -1572,7 +1572,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 = NM_BRIDGE_HELLO_TIME_DEF; - priv->max_age = BRIDGE_MAX_AGE_DEFAULT; + priv->max_age = NM_BRIDGE_MAX_AGE_DEF; priv->multicast_last_member_count = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT; priv->multicast_last_member_interval = BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT; priv->multicast_membership_interval = BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT; @@ -1766,7 +1766,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass) */ obj_properties[PROP_MAX_AGE] = g_param_spec_uint (NM_SETTING_BRIDGE_MAX_AGE, "", "", - 0, NM_BR_MAX_MAX_AGE, BRIDGE_MAX_AGE_DEFAULT, + 0, NM_BRIDGE_MAX_AGE_MAX, NM_BRIDGE_MAX_AGE_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 784084cbd0..460faa65fa 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -264,7 +264,7 @@ static const Option master_options[] = { TRUE, TRUE, TRUE }, { NM_SETTING_BRIDGE_MAX_AGE, "max_age", NULL, NULL, - 0, NM_BR_MAX_MAX_AGE, 20, + NM_BRIDGE_MAX_AGE_MIN, NM_BRIDGE_MAX_AGE_MAX, NM_BRIDGE_MAX_AGE_DEF, TRUE, TRUE, TRUE }, { NM_SETTING_BRIDGE_AGEING_TIME, "ageing_time", NULL, NULL,