diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-05-05 13:11:32 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-05-08 08:02:50 +0200 |
| commit | 433bb1fbe4df22242fe7702fb97ae77695fa03dc (patch) | |
| tree | 2af3d54bfb81e94217b3b50cbd076e690762c21a | |
| parent | 96bb90a1ef5a2d54b4f2509a11f49708d16a5d7a (diff) | |
| download | NetworkManager-433bb1fbe4df22242fe7702fb97ae77695fa03dc.tar.gz | |
libnm: adjust bridge defines NM_BRIDGE_MULTICAST_SNOOPING_DEF
| -rw-r--r-- | libnm-core/nm-core-internal.h | 3 | ||||
| -rw-r--r-- | libnm-core/nm-setting-bridge.c | 4 | ||||
| -rw-r--r-- | src/devices/nm-device-bridge.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 445a932a3e..1c688d47ea 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -141,7 +141,8 @@ #define NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF FALSE -#define BRIDGE_MULTICAST_SNOOPING_DEFAULT TRUE +#define NM_BRIDGE_MULTICAST_SNOOPING_DEF TRUE + #define BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT 2 #define BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT 3125 #define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT 1 diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index 8e41d61128..7ead41a44f 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -1577,7 +1577,7 @@ nm_setting_bridge_init (NMSettingBridge *setting) priv->multicast_last_member_interval = NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF; priv->multicast_membership_interval = NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF; priv->multicast_hash_max = NM_BRIDGE_MULTICAST_HASH_MAX_DEF; - priv->multicast_snooping = BRIDGE_MULTICAST_SNOOPING_DEFAULT; + priv->multicast_snooping = NM_BRIDGE_MULTICAST_SNOOPING_DEF; priv->priority = NM_BRIDGE_PRIORITY_DEF; priv->stp = NM_BRIDGE_STP_DEF; priv->vlan_default_pvid = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT; @@ -1831,7 +1831,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass) */ obj_properties[PROP_MULTICAST_SNOOPING] = g_param_spec_boolean (NM_SETTING_BRIDGE_MULTICAST_SNOOPING, "", "", - BRIDGE_MULTICAST_SNOOPING_DEFAULT, + NM_BRIDGE_MULTICAST_SNOOPING_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 4e74d1d72f..2c9ec58a02 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -312,7 +312,7 @@ static const Option master_options[] = { FALSE, FALSE, FALSE }, { NM_SETTING_BRIDGE_MULTICAST_SNOOPING, "multicast_snooping", NULL, NULL, - 0, 1, 1, + FALSE, TRUE, NM_BRIDGE_MULTICAST_SNOOPING_DEF, FALSE, FALSE, FALSE }, { NM_SETTING_BRIDGE_MULTICAST_ROUTER, "multicast_router", to_sysfs_multicast_router, from_sysfs_multicast_router, |