fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-28 06:20:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: adjust bridge defines NM_BRIDGE_MULTICAST_HASH_MAX_*

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

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

@ -97,8 +97,9 @@
#define NM_BR_PORT_MAX_PATH_COST 65535
#define NM_BR_PORT_DEF_PATH_COST 100
#define NM_BR_MIN_MULTICAST_HASH_MAX 1
#define NM_BR_MAX_MULTICAST_HASH_MAX G_MAXUINT32
#define NM_BRIDGE_MULTICAST_HASH_MAX_MIN 1u
#define NM_BRIDGE_MULTICAST_HASH_MAX_DEF 4096u
#define NM_BRIDGE_MULTICAST_HASH_MAX_MAX ((guint) G_MAXUINT32)
#define BRIDGE_AGEING_TIME_DEFAULT 300
#define BRIDGE_FORWARD_DELAY_DEFAULT 15
@ -108,7 +109,6 @@
#define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT 100
#define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT 26000
#define BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT 25500
#define BRIDGE_MULTICAST_HASH_MAX_DEFAULT 4096
#define BRIDGE_MULTICAST_QUERIER_DEFAULT FALSE
#define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT 12500
#define BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT 1000

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

@ -1576,7 +1576,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
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;
priv->multicast_hash_max = BRIDGE_MULTICAST_HASH_MAX_DEFAULT;
priv->multicast_hash_max = NM_BRIDGE_MULTICAST_HASH_MAX_DEF;
priv->multicast_snooping = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
priv->priority = BRIDGE_PRIORITY_DEFAULT;
priv->stp = BRIDGE_STP_DEFAULT;
@ -2082,7 +2082,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
*/
obj_properties[PROP_MULTICAST_HASH_MAX] =
g_param_spec_uint (NM_SETTING_BRIDGE_MULTICAST_HASH_MAX, "", "",
NM_BR_MIN_MULTICAST_HASH_MAX, NM_BR_MAX_MULTICAST_HASH_MAX, BRIDGE_MULTICAST_HASH_MAX_DEFAULT,
NM_BRIDGE_MULTICAST_HASH_MAX_MIN, NM_BRIDGE_MULTICAST_HASH_MAX_MAX, NM_BRIDGE_MULTICAST_HASH_MAX_DEF,
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);

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

@ -276,7 +276,7 @@ static const Option master_options[] = {
TRUE, FALSE, FALSE },
{ NM_SETTING_BRIDGE_MULTICAST_HASH_MAX, "hash_max",
NULL, NULL,
NM_BR_MIN_MULTICAST_HASH_MAX, NM_BR_MAX_MULTICAST_HASH_MAX, 4096,
NM_BRIDGE_MULTICAST_HASH_MAX_MIN, NM_BRIDGE_MULTICAST_HASH_MAX_MAX, NM_BRIDGE_MULTICAST_HASH_MAX_DEF,
FALSE, FALSE, FALSE },
{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT, "multicast_last_member_count",
NULL, NULL,