fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 03:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: adjust bridge defines NM_BRIDGE_FORWARD_DELAY_*

Browse source
This commit is contained in:
Thomas Haller 2020-05-05 10:49:58 +02:00
parent f61e354cfa
commit 8ee4dbf709
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libnm-core/nm-core-internal.h
View file

@ -81,8 +81,9 @@
#define NM_BR_MIN_HELLO_TIME 1 #define NM_BR_MIN_HELLO_TIME 1
#define NM_BR_MAX_HELLO_TIME 10 #define NM_BR_MAX_HELLO_TIME 10
#define NM_BR_MIN_FORWARD_DELAY 2 #define NM_BRIDGE_FORWARD_DELAY_MIN 2u
#define NM_BR_MAX_FORWARD_DELAY 30 #define NM_BRIDGE_FORWARD_DELAY_DEF 15u
#define NM_BRIDGE_FORWARD_DELAY_MAX 30u
#define NM_BR_MIN_MAX_AGE 6 #define NM_BR_MIN_MAX_AGE 6
#define NM_BR_MAX_MAX_AGE 40 #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_DEF 4096u
#define NM_BRIDGE_MULTICAST_HASH_MAX_MAX ((guint) G_MAXUINT32) #define NM_BRIDGE_MULTICAST_HASH_MAX_MAX ((guint) G_MAXUINT32)
#define BRIDGE_FORWARD_DELAY_DEFAULT 15
#define BRIDGE_HELLO_TIME_DEFAULT 2 #define BRIDGE_HELLO_TIME_DEFAULT 2
#define BRIDGE_MAX_AGE_DEFAULT 20 #define BRIDGE_MAX_AGE_DEFAULT 20
#define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT 2 #define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT 2

8
libnm-core/nm-setting-bridge.c
View file

@ -1200,8 +1200,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
} }
if (!check_range (priv->forward_delay, if (!check_range (priv->forward_delay,
NM_BR_MIN_FORWARD_DELAY, NM_BRIDGE_FORWARD_DELAY_MIN,
NM_BR_MAX_FORWARD_DELAY, NM_BRIDGE_FORWARD_DELAY_MAX,
!priv->stp, !priv->stp,
NM_SETTING_BRIDGE_FORWARD_DELAY, NM_SETTING_BRIDGE_FORWARD_DELAY,
error)) 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->vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
priv->ageing_time = NM_BRIDGE_AGEING_TIME_DEF; 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->hello_time = BRIDGE_HELLO_TIME_DEFAULT;
priv->max_age = BRIDGE_MAX_AGE_DEFAULT; priv->max_age = BRIDGE_MAX_AGE_DEFAULT;
priv->multicast_last_member_count = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_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] = obj_properties[PROP_FORWARD_DELAY] =
g_param_spec_uint (NM_SETTING_BRIDGE_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 | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);

2
src/devices/nm-device-bridge.c
View file

@ -256,7 +256,7 @@ static const Option master_options[] = {
TRUE, FALSE, TRUE }, TRUE, FALSE, TRUE },
{ NM_SETTING_BRIDGE_FORWARD_DELAY, "forward_delay", { NM_SETTING_BRIDGE_FORWARD_DELAY, "forward_delay",
NULL, NULL, 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}, TRUE, TRUE, TRUE},
{ NM_SETTING_BRIDGE_HELLO_TIME, "hello_time", { NM_SETTING_BRIDGE_HELLO_TIME, "hello_time",
NULL, NULL, NULL, NULL,