diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-05-05 13:18:25 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-05-08 08:02:51 +0200 |
| commit | f34144f70b0da2a03a90d5f27815fdd1d9b5be63 (patch) | |
| tree | 9c1a990259b3ba35655e8b042d676a8493b1ba6f | |
| parent | 55311c6a6a5b7d25d64849c1c7aaaeca752e393d (diff) | |
| download | NetworkManager-f34144f70b0da2a03a90d5f27815fdd1d9b5be63.tar.gz | |
libnm: adjust bridge defines NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_*
| -rw-r--r-- | libnm-core/nm-core-internal.h | 5 | ||||
| -rw-r--r-- | libnm-core/nm-setting-bridge.c | 4 | ||||
| -rw-r--r-- | src/devices/nm-device-bridge.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 75b001117f..1b4f8fd7ea 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -147,7 +147,10 @@ #define NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEF 2u #define NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MAX ((guint) G_MAXUINT32) -#define BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT 3125 +#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MIN ((guint64) 0) +#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF ((guint64) 3125) +#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MAX G_MAXUINT64 + #define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT 1 #define BRIDGE_VLAN_STATS_ENABLED_DEFAULT FALSE diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index 1bdd762bf2..dbd81a7d89 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -1586,7 +1586,7 @@ nm_setting_bridge_init (NMSettingBridge *setting) priv->multicast_query_response_interval = NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF; priv->multicast_querier_interval = NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF; priv->multicast_startup_query_count = NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEF; - priv->multicast_startup_query_interval = BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT; + priv->multicast_startup_query_interval = NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF; nm_assert (priv->multicast_querier == NM_BRIDGE_MULTICAST_QUERIER_DEF); nm_assert (priv->multicast_query_use_ifaddr == NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF); @@ -2260,7 +2260,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass) */ obj_properties[PROP_MULTICAST_STARTUP_QUERY_INTERVAL] = g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL, "", "", - 0, G_MAXUINT64, BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT, + NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MIN, NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MAX, NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_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 ba4b9e098b..a963a0449d 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -324,7 +324,7 @@ static const Option master_options[] = { FALSE, FALSE, FALSE }, { NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL, "multicast_startup_query_interval", NULL, NULL, - 0, G_MAXUINT64, 3125, + NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MIN, NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MAX, NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF, FALSE, FALSE, FALSE }, { NM_SETTING_BRIDGE_GROUP_ADDRESS, "group_addr", to_sysfs_group_address, from_sysfs_group_address, |