system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-09-06 09:04:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

libnm-util: remove InfiniBand references in NMSettingVlan

Browse source 
IPoIB doesn't support VLANs (it has something similar done
differently), so remove the references to it in the docs.
This commit is contained in:
Dan Winship 2012-07-30 20:36:37 -04:00
parent 61bb3738cb
commit 1814fbca71
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libnm-util/nm-setting-vlan.c
View file

@ -614,8 +614,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
* a default name will be constructed from the interface described by the
* parent interface and the #NMSettingVlan:id , ex 'eth2.1'. The parent
* interface may be given by the #NMSettingVlan:parent property or by a
* hardware address property, eg #NMSettingWired:mac-address or
* #NMSettingInfiniband:mac-address.
* hardware address property, eg #NMSettingWired:mac-address.
**/
g_object_class_install_property
(object_class, PROP_IFACE_NAME,
@ -627,8 +626,8 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
"parent interface and the 'id' property, ex "
"'eth2.1'. The parent interface may be given by "
"the 'parent' property or by a hardware address "
"property, eg the 'wired' or 'infiniband' "
"settings' 'mac-address' property.",
"property, eg the 'wired' settings' 'mac-address' "
"property.",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
@ -638,8 +637,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
* If given, specifies the parent interface name or parent connection UUID
* from which this VLAN interface should be created. If this property is
* not specified, the connection must contain a hardware address in a
* hardware-specific setting, like #NMSettingWired:mac-address or
* #NMSettingInfiniband:mac-address.
* hardware-specific setting, like #NMSettingWired:mac-address.
**/
g_object_class_install_property
(object_class, PROP_PARENT,
@ -650,8 +648,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
"interface should be created. If this property is "
"not specified, the connection must contain a "
"hardware address in a hardware-specific setting, "
"like the 'wired' or 'infiniband' settings' "
"'mac-address' property.",
"like the 'wired' settings' 'mac-address' property.",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));