diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-11-23 15:52:07 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-11-23 18:43:48 +0100 |
| commit | 901520af85492b947e9a1a392b739e1c69c6e5c4 (patch) | |
| tree | c49876599c2b46665bb54765b49130c93dbf3a34 | |
| parent | 30ce598fb5a667387856c435e2ba5e38434e52d7 (diff) | |
| download | NetworkManager-901520af85492b947e9a1a392b739e1c69c6e5c4.tar.gz | |
libnm: move bridge min/max defines to header file
| -rw-r--r-- | libnm-core/nm-core-internal.h | 14 | ||||
| -rw-r--r-- | libnm-core/nm-setting-bridge.c | 38 |
2 files changed, 26 insertions, 26 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 5144a05077..de39deabd9 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -80,6 +80,20 @@ #include "nm-core-types-internal.h" #include "nm-vpn-editor-plugin.h" +/* IEEE 802.1D-1998 timer values */ +#define NM_BR_MIN_HELLO_TIME 1 +#define NM_BR_MAX_HELLO_TIME 10 + +#define NM_BR_MIN_FORWARD_DELAY 2 +#define NM_BR_MAX_FORWARD_DELAY 30 + +#define NM_BR_MIN_MAX_AGE 6 +#define NM_BR_MAX_MAX_AGE 40 + +/* IEEE 802.1D-1998 Table 7.4 */ +#define NM_BR_MIN_AGEING_TIME 0 +#define NM_BR_MAX_AGEING_TIME 1000000 + /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated * connection can be replaced by a already-defined connection. This flag only * takes into account properties marked with the %NM_SETTING_PARAM_INFERRABLE diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index 187d71d3fe..112b499f31 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -213,20 +213,6 @@ nm_setting_bridge_get_multicast_snooping (NMSettingBridge *setting) return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_snooping; } -/* IEEE 802.1D-1998 timer values */ -#define BR_MIN_HELLO_TIME 1 -#define BR_MAX_HELLO_TIME 10 - -#define BR_MIN_FORWARD_DELAY 2 -#define BR_MAX_FORWARD_DELAY 30 - -#define BR_MIN_MAX_AGE 6 -#define BR_MAX_MAX_AGE 40 - -/* IEEE 802.1D-1998 Table 7.4 */ -#define BR_MIN_AGEING_TIME 0 -#define BR_MAX_AGEING_TIME 1000000 - static inline gboolean check_range (guint32 val, guint32 min, @@ -265,32 +251,32 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } if (!check_range (priv->forward_delay, - BR_MIN_FORWARD_DELAY, - BR_MAX_FORWARD_DELAY, + NM_BR_MIN_FORWARD_DELAY, + NM_BR_MAX_FORWARD_DELAY, !priv->stp, NM_SETTING_BRIDGE_FORWARD_DELAY, error)) return FALSE; if (!check_range (priv->hello_time, - BR_MIN_HELLO_TIME, - BR_MAX_HELLO_TIME, + NM_BR_MIN_HELLO_TIME, + NM_BR_MAX_HELLO_TIME, !priv->stp, NM_SETTING_BRIDGE_HELLO_TIME, error)) return FALSE; if (!check_range (priv->max_age, - BR_MIN_MAX_AGE, - BR_MAX_MAX_AGE, + NM_BR_MIN_MAX_AGE, + NM_BR_MAX_MAX_AGE, !priv->stp, NM_SETTING_BRIDGE_MAX_AGE, error)) return FALSE; if (!check_range (priv->ageing_time, - BR_MIN_AGEING_TIME, - BR_MAX_AGEING_TIME, + NM_BR_MIN_AGEING_TIME, + NM_BR_MAX_AGEING_TIME, !priv->stp, NM_SETTING_BRIDGE_AGEING_TIME, error)) @@ -524,7 +510,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) g_object_class_install_property (object_class, PROP_FORWARD_DELAY, g_param_spec_uint (NM_SETTING_BRIDGE_FORWARD_DELAY, "", "", - 0, BR_MAX_FORWARD_DELAY, 15, + 0, NM_BR_MAX_FORWARD_DELAY, 15, G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | @@ -546,7 +532,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) g_object_class_install_property (object_class, PROP_HELLO_TIME, g_param_spec_uint (NM_SETTING_BRIDGE_HELLO_TIME, "", "", - 0, BR_MAX_HELLO_TIME, 2, + 0, NM_BR_MAX_HELLO_TIME, 2, G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | @@ -568,7 +554,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) g_object_class_install_property (object_class, PROP_MAX_AGE, g_param_spec_uint (NM_SETTING_BRIDGE_MAX_AGE, "", "", - 0, BR_MAX_MAX_AGE, 20, + 0, NM_BR_MAX_MAX_AGE, 20, G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | @@ -590,7 +576,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) g_object_class_install_property (object_class, PROP_AGEING_TIME, g_param_spec_uint (NM_SETTING_BRIDGE_AGEING_TIME, "", "", - 0, BR_MAX_AGEING_TIME, 300, + NM_BR_MIN_AGEING_TIME, NM_BR_MAX_AGEING_TIME, 300, G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | |