diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-05-05 12:51:22 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-05-08 08:02:50 +0200 |
| commit | 58001f70e853ec523058500757beaafcbd21b600 (patch) | |
| tree | 1f703299cea4b85af81b38c0f047f9e327cc42fa | |
| parent | 08cfe812ecd28a5fc590fcd5a98ea4ad074496b5 (diff) | |
| download | NetworkManager-58001f70e853ec523058500757beaafcbd21b600.tar.gz | |
libnm: adjust bridge defines NM_BRIDGE_MULTICAST_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 05204b2564..ad1c689ad3 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -131,7 +131,10 @@ #define NM_BRIDGE_MULTICAST_QUERIER_DEF FALSE -#define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT 12500 +#define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MIN ((guint64) 0) +#define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF ((guint64) 12500) +#define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MAX G_MAXUINT64 + #define BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT 1000 #define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT FALSE #define BRIDGE_MULTICAST_SNOOPING_DEFAULT TRUE diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index 5a6fa651a4..bd94d80fdb 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -1582,7 +1582,7 @@ nm_setting_bridge_init (NMSettingBridge *setting) priv->stp = NM_BRIDGE_STP_DEF; priv->vlan_default_pvid = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT; priv->vlan_stats_enabled = BRIDGE_VLAN_STATS_ENABLED_DEFAULT; - priv->multicast_query_interval = BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT; + priv->multicast_query_interval = NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF; priv->multicast_query_response_interval = BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT; priv->multicast_query_use_ifaddr = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT; priv->multicast_querier_interval = NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF; @@ -2195,7 +2195,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass) */ obj_properties[PROP_MULTICAST_QUERY_INTERVAL] = g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL, "", "", - 0, G_MAXUINT64, BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT, + NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MAX, NM_BRIDGE_MULTICAST_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 7941ca5304..720c053875 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -300,7 +300,7 @@ static const Option master_options[] = { FALSE, FALSE, FALSE }, { NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL, "multicast_query_interval", NULL, NULL, - 0, G_MAXUINT64, 12500, + NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MAX, NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF, FALSE, FALSE, FALSE }, { NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL, "multicast_query_response_interval", NULL, NULL, |