colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: adjust bridge defines NM_BRIDGE_PORT_PATH_COST_*

Browse Source
This commit is contained in:
Thomas Haller
2020-05-05 11:53:18 +02:00
parent a7421f8bf2
commit 4c3691e52e
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libnm-core/nm-core-internal.h
View File

@@ -99,8 +99,9 @@
#define NM_BRIDGE_PORT_PRIORITY_DEF 32u #define NM_BRIDGE_PORT_PRIORITY_DEF 32u
#define NM_BRIDGE_PORT_PRIORITY_MAX 63u #define NM_BRIDGE_PORT_PRIORITY_MAX 63u
#define NM_BR_PORT_MAX_PATH_COST 65535 #define NM_BRIDGE_PORT_PATH_COST_MIN 0u
#define NM_BR_PORT_DEF_PATH_COST 100 #define NM_BRIDGE_PORT_PATH_COST_DEF 100u
#define NM_BRIDGE_PORT_PATH_COST_MAX 65535u
#define NM_BRIDGE_MULTICAST_HASH_MAX_MIN 1u #define NM_BRIDGE_MULTICAST_HASH_MAX_MIN 1u
#define NM_BRIDGE_MULTICAST_HASH_MAX_DEF 4096u #define NM_BRIDGE_MULTICAST_HASH_MAX_DEF 4096u

4
libnm-core/nm-setting-bridge-port.c
View File

@@ -443,7 +443,7 @@ nm_setting_bridge_port_init (NMSettingBridgePort *setting)
priv->vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref); priv->vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
priv->priority = NM_BRIDGE_PORT_PRIORITY_DEF; priv->priority = NM_BRIDGE_PORT_PRIORITY_DEF;
priv->path_cost = NM_BR_PORT_DEF_PATH_COST; priv->path_cost = NM_BRIDGE_PORT_PATH_COST_DEF;
} }
/** /**
@@ -521,7 +521,7 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
*/ */
obj_properties[PROP_PATH_COST] = obj_properties[PROP_PATH_COST] =
g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST, "", "", g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST, "", "",
0, NM_BR_PORT_MAX_PATH_COST, NM_BR_PORT_DEF_PATH_COST, NM_BRIDGE_PORT_PATH_COST_MIN, NM_BRIDGE_PORT_PATH_COST_MAX, NM_BRIDGE_PORT_PATH_COST_DEF,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);

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

@@ -348,7 +348,7 @@ static const Option slave_options[] = {
TRUE, FALSE }, TRUE, FALSE },
{ NM_SETTING_BRIDGE_PORT_PATH_COST, "path_cost", { NM_SETTING_BRIDGE_PORT_PATH_COST, "path_cost",
NULL, NULL, NULL, NULL,
0, NM_BR_PORT_MAX_PATH_COST, 100, NM_BRIDGE_PORT_PATH_COST_MIN, NM_BRIDGE_PORT_PATH_COST_MAX, NM_BRIDGE_PORT_PATH_COST_DEF,
TRUE, FALSE }, TRUE, FALSE },
{ NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "hairpin_mode", { NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "hairpin_mode",
NULL, NULL, NULL, NULL,