diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-05-05 13:29:21 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-05-08 08:02:51 +0200 |
| commit | 42288df043497b6e881c0a8e4f35df1553bd5530 (patch) | |
| tree | ac815a27382c514202762063571db88f53ff2c30 | |
| parent | bfcfdc2955b2a9833aef3b539eb8b254f88e6203 (diff) | |
| download | NetworkManager-42288df043497b6e881c0a8e4f35df1553bd5530.tar.gz | |
libnm: adjust bridge defines NM_BRIDGE_VLAN_DEFAULT_PVID_DEF
| -rw-r--r-- | libnm-core/nm-core-internal.h | 2 | ||||
| -rw-r--r-- | libnm-core/nm-setting-bridge.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 4fc6d913c4..57f46f94be 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -153,7 +153,7 @@ #define NM_BRIDGE_VLAN_STATS_ENABLED_DEF FALSE -#define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT 1 +#define NM_BRIDGE_VLAN_DEFAULT_PVID_DEF 1u /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated * connection can be replaced by a already-defined connection. This flag only diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index df34111e0d..18aaff2a5e 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -1580,7 +1580,7 @@ nm_setting_bridge_init (NMSettingBridge *setting) 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; + priv->vlan_default_pvid = NM_BRIDGE_VLAN_DEFAULT_PVID_DEF; 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; @@ -1876,7 +1876,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass) */ obj_properties[PROP_VLAN_DEFAULT_PVID] = g_param_spec_uint (NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID, "", "", - 0, NM_BRIDGE_VLAN_VID_MAX, BRIDGE_VLAN_DEFAULT_PVID_DEFAULT, + 0, NM_BRIDGE_VLAN_VID_MAX, NM_BRIDGE_VLAN_DEFAULT_PVID_DEF, G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); |