diff options
author | Thomas Haller <thaller@redhat.com> | 2018-07-10 08:14:56 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-07-24 09:39:09 +0200 |
commit | b9ae79c273b069f48ea458855f5a3f1873b99e9c (patch) | |
tree | 3a10b9c8067b27f08aa0ec2101149e084a38e528 | |
parent | 0b8e1fd9711ba1bdb6d84dc7585d1e706882bb31 (diff) | |
download | NetworkManager-b9ae79c273b069f48ea458855f5a3f1873b99e9c.tar.gz |
device/trivial: rename NMDeviceClass.connection_type to connection_type_supported
The term "connection_type" is overused. Give it a more distinct name.
-rw-r--r-- | src/devices/nm-device-6lowpan.c | 2 | ||||
-rw-r--r-- | src/devices/nm-device-dummy.c | 2 | ||||
-rw-r--r-- | src/devices/nm-device-macsec.c | 2 | ||||
-rw-r--r-- | src/devices/nm-device-macvlan.c | 2 | ||||
-rw-r--r-- | src/devices/nm-device-private.h | 2 | ||||
-rw-r--r-- | src/devices/nm-device-tun.c | 2 | ||||
-rw-r--r-- | src/devices/nm-device-vxlan.c | 2 | ||||
-rw-r--r-- | src/devices/nm-device-wpan.c | 2 | ||||
-rw-r--r-- | src/devices/nm-device.c | 7 | ||||
-rw-r--r-- | src/devices/nm-device.h | 2 | ||||
-rw-r--r-- | src/devices/ovs/nm-device-ovs-bridge.c | 2 | ||||
-rw-r--r-- | src/devices/ovs/nm-device-ovs-interface.c | 2 | ||||
-rw-r--r-- | src/devices/ovs/nm-device-ovs-port.c | 2 |
13 files changed, 16 insertions, 15 deletions
diff --git a/src/devices/nm-device-6lowpan.c b/src/devices/nm-device-6lowpan.c index 2f395f4a2b..36a9eb6f4f 100644 --- a/src/devices/nm-device-6lowpan.c +++ b/src/devices/nm-device-6lowpan.c @@ -303,7 +303,7 @@ nm_device_6lowpan_class_init (NMDevice6LowpanClass *klass) device_class->act_stage1_prepare = act_stage1_prepare; device_class->check_connection_compatible = check_connection_compatible; device_class->complete_connection = complete_connection; - device_class->connection_type = NM_SETTING_6LOWPAN_SETTING_NAME; + device_class->connection_type_supported = NM_SETTING_6LOWPAN_SETTING_NAME; device_class->create_and_realize = create_and_realize; device_class->get_generic_capabilities = get_generic_capabilities; device_class->get_configured_mtu = nm_device_get_configured_mtu_for_wired; diff --git a/src/devices/nm-device-dummy.c b/src/devices/nm-device-dummy.c index 9be4d29f20..4b19b80c1d 100644 --- a/src/devices/nm-device-dummy.c +++ b/src/devices/nm-device-dummy.c @@ -177,7 +177,7 @@ nm_device_dummy_class_init (NMDeviceDummyClass *klass) dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_device_dummy); - device_class->connection_type = NM_SETTING_DUMMY_SETTING_NAME; + device_class->connection_type_supported = NM_SETTING_DUMMY_SETTING_NAME; device_class->complete_connection = complete_connection; device_class->check_connection_compatible = check_connection_compatible; device_class->create_and_realize = create_and_realize; diff --git a/src/devices/nm-device-macsec.c b/src/devices/nm-device-macsec.c index a369bdad93..c03436072a 100644 --- a/src/devices/nm-device-macsec.c +++ b/src/devices/nm-device-macsec.c @@ -861,7 +861,7 @@ nm_device_macsec_class_init (NMDeviceMacsecClass *klass) device_class->state_changed = device_state_changed; device_class->get_configured_mtu = nm_device_get_configured_mtu_for_wired; - device_class->connection_type = NM_SETTING_MACSEC_SETTING_NAME; + device_class->connection_type_supported = NM_SETTING_MACSEC_SETTING_NAME; obj_properties[PROP_SCI] = g_param_spec_uint64 (NM_DEVICE_MACSEC_SCI, "", "", diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c index 9adcd3753d..49c1f6eb88 100644 --- a/src/devices/nm-device-macvlan.c +++ b/src/devices/nm-device-macvlan.c @@ -505,7 +505,7 @@ nm_device_macvlan_class_init (NMDeviceMacvlanClass *klass) device_class->act_stage1_prepare = act_stage1_prepare; device_class->check_connection_compatible = check_connection_compatible; device_class->complete_connection = complete_connection; - device_class->connection_type = NM_SETTING_MACVLAN_SETTING_NAME; + device_class->connection_type_supported = NM_SETTING_MACVLAN_SETTING_NAME; device_class->create_and_realize = create_and_realize; device_class->get_generic_capabilities = get_generic_capabilities; device_class->get_configured_mtu = nm_device_get_configured_mtu_for_wired; diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h index dd928d859e..edfb91ecf6 100644 --- a/src/devices/nm-device-private.h +++ b/src/devices/nm-device-private.h @@ -131,7 +131,7 @@ void nm_device_commit_mtu (NMDevice *self); /*****************************************************************************/ #define NM_DEVICE_CLASS_DECLARE_TYPES(klass, conn_type, ...) \ - NM_DEVICE_CLASS (klass)->connection_type = conn_type; \ + NM_DEVICE_CLASS (klass)->connection_type_supported = conn_type; \ { \ static const NMLinkType link_types[] = { __VA_ARGS__, NM_LINK_TYPE_NONE }; \ NM_DEVICE_CLASS (klass)->link_types = link_types; \ diff --git a/src/devices/nm-device-tun.c b/src/devices/nm-device-tun.c index 3846676c1f..d8930e0fdb 100644 --- a/src/devices/nm-device-tun.c +++ b/src/devices/nm-device-tun.c @@ -436,7 +436,7 @@ nm_device_tun_class_init (NMDeviceTunClass *klass) dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_device_tun); - device_class->connection_type = NM_SETTING_TUN_SETTING_NAME; + device_class->connection_type_supported = NM_SETTING_TUN_SETTING_NAME; device_class->link_changed = link_changed; device_class->complete_connection = complete_connection; device_class->check_connection_compatible = check_connection_compatible; diff --git a/src/devices/nm-device-vxlan.c b/src/devices/nm-device-vxlan.c index e125222374..3b29110adc 100644 --- a/src/devices/nm-device-vxlan.c +++ b/src/devices/nm-device-vxlan.c @@ -585,7 +585,7 @@ nm_device_vxlan_class_init (NMDeviceVxlanClass *klass) device_class->link_changed = link_changed; device_class->unrealize_notify = unrealize_notify; - device_class->connection_type = NM_SETTING_VXLAN_SETTING_NAME; + device_class->connection_type_supported = NM_SETTING_VXLAN_SETTING_NAME; device_class->create_and_realize = create_and_realize; device_class->check_connection_compatible = check_connection_compatible; device_class->complete_connection = complete_connection; diff --git a/src/devices/nm-device-wpan.c b/src/devices/nm-device-wpan.c index 978dfa00ac..c91f87db7f 100644 --- a/src/devices/nm-device-wpan.c +++ b/src/devices/nm-device-wpan.c @@ -217,7 +217,7 @@ nm_device_wpan_class_init (NMDeviceWpanClass *klass) dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_device_wpan); - device_class->connection_type = NM_SETTING_WPAN_SETTING_NAME; + device_class->connection_type_supported = NM_SETTING_WPAN_SETTING_NAME; device_class->complete_connection = complete_connection; device_class->check_connection_compatible = check_connection_compatible; device_class->update_connection = update_connection; diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 06265ecc09..ea3649014a 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5239,8 +5239,9 @@ nm_device_generate_connection (NMDevice *self, NM_SETTING_CONNECTION_INTERFACE_NAME, ifname, NM_SETTING_CONNECTION_TIMESTAMP, (guint64) time (NULL), NULL); - if (klass->connection_type) - g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, klass->connection_type, NULL); + if (klass->connection_type_supported) + g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, klass->connection_type_supported, NULL); + nm_connection_add_setting (connection, s_con); /* If the device is a slave, update various slave settings */ @@ -5474,7 +5475,7 @@ nm_device_check_slave_connection_compatible (NMDevice *self, NMConnection *slave return FALSE; /* All masters should have connection type set */ - connection_type = NM_DEVICE_GET_CLASS (self)->connection_type; + connection_type = NM_DEVICE_GET_CLASS (self)->connection_type_supported; g_return_val_if_fail (connection_type, FALSE); s_con = nm_connection_get_setting_connection (slave); diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index d145f8fc20..defd7ffad4 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -202,7 +202,7 @@ typedef struct _NMDeviceClass { struct _NMDeviceClass *default_type_description_klass; const char *default_type_description; - const char *connection_type; + const char *connection_type_supported; const NMLinkType *link_types; /* Whether the device type is a master-type. This depends purely on the diff --git a/src/devices/ovs/nm-device-ovs-bridge.c b/src/devices/ovs/nm-device-ovs-bridge.c index 2e4d1cbdf8..ca63c568f5 100644 --- a/src/devices/ovs/nm-device-ovs-bridge.c +++ b/src/devices/ovs/nm-device-ovs-bridge.c @@ -152,7 +152,7 @@ nm_device_ovs_bridge_class_init (NMDeviceOvsBridgeClass *klass) dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_device_ovs_bridge); - device_class->connection_type = NM_SETTING_OVS_BRIDGE_SETTING_NAME; + device_class->connection_type_supported = NM_SETTING_OVS_BRIDGE_SETTING_NAME; device_class->is_master = TRUE; device_class->get_type_description = get_type_description; device_class->create_and_realize = create_and_realize; diff --git a/src/devices/ovs/nm-device-ovs-interface.c b/src/devices/ovs/nm-device-ovs-interface.c index c59af7a6b1..d8217330cf 100644 --- a/src/devices/ovs/nm-device-ovs-interface.c +++ b/src/devices/ovs/nm-device-ovs-interface.c @@ -203,7 +203,7 @@ nm_device_ovs_interface_class_init (NMDeviceOvsInterfaceClass *klass) dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_device_ovs_interface); - device_class->connection_type = NM_SETTING_OVS_INTERFACE_SETTING_NAME; + device_class->connection_type_supported = NM_SETTING_OVS_INTERFACE_SETTING_NAME; device_class->get_type_description = get_type_description; device_class->create_and_realize = create_and_realize; device_class->get_generic_capabilities = get_generic_capabilities; diff --git a/src/devices/ovs/nm-device-ovs-port.c b/src/devices/ovs/nm-device-ovs-port.c index a9a2b24a2b..8123ac9647 100644 --- a/src/devices/ovs/nm-device-ovs-port.c +++ b/src/devices/ovs/nm-device-ovs-port.c @@ -198,7 +198,7 @@ nm_device_ovs_port_class_init (NMDeviceOvsPortClass *klass) dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_device_ovs_port); - device_class->connection_type = NM_SETTING_OVS_PORT_SETTING_NAME; + device_class->connection_type_supported = NM_SETTING_OVS_PORT_SETTING_NAME; device_class->is_master = TRUE; device_class->get_type_description = get_type_description; device_class->create_and_realize = create_and_realize; |