diff options
Diffstat (limited to 'src/libnm-core-public')
| -rw-r--r-- | src/libnm-core-public/nm-dbus-interface.h | 24 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-setting-connection.h | 6 |
2 files changed, 17 insertions, 13 deletions
diff --git a/src/libnm-core-public/nm-dbus-interface.h b/src/libnm-core-public/nm-dbus-interface.h index cf6e8090..5eedd7da 100644 --- a/src/libnm-core-public/nm-dbus-interface.h +++ b/src/libnm-core-public/nm-dbus-interface.h @@ -213,11 +213,11 @@ typedef enum { * @NM_DEVICE_TYPE_MODEM: a modem supporting analog telephone, CDMA/EVDO, * GSM/UMTS, or LTE network access protocols * @NM_DEVICE_TYPE_INFINIBAND: an IP-over-InfiniBand device - * @NM_DEVICE_TYPE_BOND: a bond master interface + * @NM_DEVICE_TYPE_BOND: a bond controller interface * @NM_DEVICE_TYPE_VLAN: an 802.1Q VLAN interface * @NM_DEVICE_TYPE_ADSL: ADSL modem - * @NM_DEVICE_TYPE_BRIDGE: a bridge master interface - * @NM_DEVICE_TYPE_TEAM: a team master interface + * @NM_DEVICE_TYPE_BRIDGE: a bridge controller interface + * @NM_DEVICE_TYPE_TEAM: a team controller interface * @NM_DEVICE_TYPE_TUN: a TUN or TAP interface * @NM_DEVICE_TYPE_IP_TUNNEL: a IP tunnel interface * @NM_DEVICE_TYPE_MACVLAN: a MACVLAN interface @@ -1091,13 +1091,13 @@ typedef enum /*< flags >*/ { /** * NMActivationStateFlags: * @NM_ACTIVATION_STATE_FLAG_NONE: an alias for numeric zero, no flags set. - * @NM_ACTIVATION_STATE_FLAG_IS_MASTER: the device is a master. - * @NM_ACTIVATION_STATE_FLAG_IS_SLAVE: the device is a slave. + * @NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER: the device is a controller. + * @NM_ACTIVATION_STATE_FLAG_IS_PORT: the device is a port. * @NM_ACTIVATION_STATE_FLAG_LAYER2_READY: layer2 is activated and ready. * @NM_ACTIVATION_STATE_FLAG_IP4_READY: IPv4 setting is completed. * @NM_ACTIVATION_STATE_FLAG_IP6_READY: IPv6 setting is completed. - * @NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES: The master has any slave devices attached. - * This only makes sense if the device is a master. + * @NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS: The controller has any port devices attached. + * This only makes sense if the device is a controller. * @NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY: the lifetime * of the activation is bound to the visibility of the connection profile, * which in turn depends on "connection.permissions" and whether a session @@ -1112,16 +1112,20 @@ typedef enum /*< flags >*/ { typedef enum /*< flags >*/ { NM_ACTIVATION_STATE_FLAG_NONE = 0, - NM_ACTIVATION_STATE_FLAG_IS_MASTER = 0x1, - NM_ACTIVATION_STATE_FLAG_IS_SLAVE = 0x2, + NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER = 0x1, + NM_ACTIVATION_STATE_FLAG_IS_PORT = 0x2, NM_ACTIVATION_STATE_FLAG_LAYER2_READY = 0x4, NM_ACTIVATION_STATE_FLAG_IP4_READY = 0x8, NM_ACTIVATION_STATE_FLAG_IP6_READY = 0x10, - NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES = 0x20, + NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS = 0x20, NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY = 0x40, NM_ACTIVATION_STATE_FLAG_EXTERNAL = 0x80, } NMActivationStateFlags; +#define NM_ACTIVATION_STATE_FLAG_IS_MASTER NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER +#define NM_ACTIVATION_STATE_FLAG_IS_SLAVE NM_ACTIVATION_STATE_FLAG_IS_PORT +#define NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES NM_ACTIVATION_FLAG_CONTROLLER_HAS_PORTS + /** * NMSettingsAddConnection2Flags: * @NM_SETTINGS_ADD_CONNECTION2_FLAG_NONE: an alias for numeric zero, no flags set. diff --git a/src/libnm-core-public/nm-setting-connection.h b/src/libnm-core-public/nm-setting-connection.h index 298fb144..4cf67346 100644 --- a/src/libnm-core-public/nm-setting-connection.h +++ b/src/libnm-core-public/nm-setting-connection.h @@ -71,12 +71,12 @@ G_BEGIN_DECLS * NMSettingConnectionAutoconnectSlaves: * @NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT: default value * @NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO: slaves are not brought up when - * master is activated + * controller is activated * @NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES: slaves are brought up when - * master is activated + * controller is activated * * #NMSettingConnectionAutoconnectSlaves values indicate whether slave connections - * should be activated when master is activated. + * should be activated when controller is activated. * * Since: 1.2 * |