diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-05-05 13:09:23 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-05-08 08:02:50 +0200 |
| commit | 96bb90a1ef5a2d54b4f2509a11f49708d16a5d7a (patch) | |
| tree | 5327e490977e650c6676a28cd93cfaefdcaafe2d | |
| parent | 0db1d28e6d5df0c1bc91bd92718fb9ee71144268 (diff) | |
| download | NetworkManager-96bb90a1ef5a2d54b4f2509a11f49708d16a5d7a.tar.gz | |
libnm: adjust bridge defines NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF
| -rw-r--r-- | libnm-core/nm-core-internal.h | 3 | ||||
| -rw-r--r-- | libnm-core/nm-setting-bridge.c | 6 | ||||
| -rw-r--r-- | src/devices/nm-device-bridge.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index e11f1fb110..445a932a3e 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -139,7 +139,8 @@ #define NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF ((guint64) 1000) #define NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MAX G_MAXUINT64 -#define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT FALSE +#define NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF FALSE + #define BRIDGE_MULTICAST_SNOOPING_DEFAULT TRUE #define BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT 2 #define BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT 3125 diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index 12db240427..8e41d61128 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -1584,12 +1584,12 @@ nm_setting_bridge_init (NMSettingBridge *setting) priv->vlan_stats_enabled = BRIDGE_VLAN_STATS_ENABLED_DEFAULT; priv->multicast_query_interval = NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF; priv->multicast_query_response_interval = NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF; - priv->multicast_query_use_ifaddr = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT; priv->multicast_querier_interval = NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF; priv->multicast_startup_query_count = BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT; priv->multicast_startup_query_interval = BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT; - nm_assert (priv->multicast_querier == NM_BRIDGE_MULTICAST_QUERIER_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); } /** @@ -2040,7 +2040,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass) */ obj_properties[PROP_MULTICAST_QUERY_USE_IFADDR] = g_param_spec_boolean (NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR, "", "", - BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT, + NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_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 b7c9a358c5..4e74d1d72f 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -308,7 +308,7 @@ static const Option master_options[] = { FALSE, FALSE, FALSE }, { NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR, "multicast_query_use_ifaddr", NULL, NULL, - 0, 1, 0, + FALSE, TRUE, NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF, FALSE, FALSE, FALSE }, { NM_SETTING_BRIDGE_MULTICAST_SNOOPING, "multicast_snooping", NULL, NULL, |