diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-05-05 12:45:20 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-05-08 08:02:50 +0200 |
| commit | 08cfe812ecd28a5fc590fcd5a98ea4ad074496b5 (patch) | |
| tree | 7bb84905967c09a1b9c4ec4179e3fa64e84a7def | |
| parent | da6bbd73aa7eee90dc6b940ff43e3d63d0750195 (diff) | |
| download | NetworkManager-08cfe812ecd28a5fc590fcd5a98ea4ad074496b5.tar.gz | |
libnm: adjust bridge defines NM_BRIDGE_MULTICAST_QUERIER_DEF
| -rw-r--r-- | libnm-core/nm-core-internal.h | 3 | ||||
| -rw-r--r-- | libnm-core/nm-setting-bridge.c | 5 | ||||
| -rw-r--r-- | src/devices/nm-device-bridge.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 42c3afaced..05204b2564 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -129,7 +129,8 @@ #define NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF ((guint64) 25500) #define NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MAX G_MAXUINT64 -#define BRIDGE_MULTICAST_QUERIER_DEFAULT FALSE +#define NM_BRIDGE_MULTICAST_QUERIER_DEF FALSE + #define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT 12500 #define BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT 1000 #define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT FALSE diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index b422563a06..5a6fa651a4 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -1585,10 +1585,11 @@ nm_setting_bridge_init (NMSettingBridge *setting) priv->multicast_query_interval = BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT; 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 = BRIDGE_MULTICAST_QUERIER_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); } /** @@ -2061,7 +2062,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass) */ obj_properties[PROP_MULTICAST_QUERIER] = g_param_spec_boolean (NM_SETTING_BRIDGE_MULTICAST_QUERIER, "", "", - BRIDGE_MULTICAST_QUERIER_DEFAULT, + NM_BRIDGE_MULTICAST_QUERIER_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 f66743e70b..7941ca5304 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -292,7 +292,7 @@ static const Option master_options[] = { FALSE, FALSE, FALSE }, { NM_SETTING_BRIDGE_MULTICAST_QUERIER, "multicast_querier", NULL, NULL, - 0, 1, 0, + FALSE, TRUE, NM_BRIDGE_MULTICAST_QUERIER_DEF, FALSE, FALSE, FALSE }, { NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL, "multicast_querier_interval", NULL, NULL, |