fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-09 08:30:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: adjust bridge defines NM_BRIDGE_VLAN_STATS_ENABLED_DEF

Browse source
This commit is contained in:
Thomas Haller 2020-05-05 13:26:30 +02:00
parent f34144f70b
commit bfcfdc2955
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libnm-core/nm-core-internal.h
View file

@ -151,8 +151,9 @@
#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF ((guint64) 3125)
#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MAX G_MAXUINT64
#define NM_BRIDGE_VLAN_STATS_ENABLED_DEF FALSE
#define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT 1
#define BRIDGE_VLAN_STATS_ENABLED_DEFAULT FALSE
/* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated
* connection can be replaced by a already-defined connection. This flag only

4
libnm-core/nm-setting-bridge.c
View file

@ -1581,7 +1581,6 @@ nm_setting_bridge_init (NMSettingBridge *setting)
priv->priority = NM_BRIDGE_PRIORITY_DEF;
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 = NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF;
priv->multicast_query_response_interval = NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF;
priv->multicast_querier_interval = NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF;
@ -1590,6 +1589,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
nm_assert (priv->multicast_querier == NM_BRIDGE_MULTICAST_QUERIER_DEF);
nm_assert (priv->multicast_query_use_ifaddr == NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF);
nm_assert (priv->vlan_stats_enabled == NM_BRIDGE_VLAN_STATS_ENABLED_DEF);
}
/**
@ -1991,7 +1991,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
*/
obj_properties[PROP_VLAN_STATS_ENABLED] =
g_param_spec_boolean (NM_SETTING_BRIDGE_VLAN_STATS_ENABLED, "", "",
BRIDGE_VLAN_STATS_ENABLED_DEFAULT,
NM_BRIDGE_VLAN_STATS_ENABLED_DEF,
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);

2
src/devices/nm-device-bridge.c
View file

@ -336,7 +336,7 @@ static const Option master_options[] = {
FALSE, FALSE, FALSE },
{ NM_SETTING_BRIDGE_VLAN_STATS_ENABLED, "vlan_stats_enabled",
NULL, NULL,
0, 1, 0,
FALSE, TRUE, NM_BRIDGE_VLAN_STATS_ENABLED_DEF,
FALSE, FALSE, FALSE },
{ NULL, NULL }
};