fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-05 10:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

trivial: s/master/parent for VLAN interface info function

Browse source
This commit is contained in:
Dan Williams 2012-03-06 11:02:55 -06:00
parent 96a2bc43af
commit 8c3ac9bdd8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nm-system.c
View file

@ -1528,18 +1528,18 @@ out:
/**
* nm_system_get_iface_vlan_info:
* @ifindex: the VLAN interface index
* @out_master_ifindex: on success, the interface index of the master interface of
* @out_parent_ifindex: on success, the interface index of the parent interface of
* @iface
* @out_vlan_id: on success, the VLAN ID of @iface
*
* Gets the VLAN master interface name and VLAN ID.
* Gets the VLAN parent interface name and VLAN ID.
*
* Returns: %TRUE if the interface is a VLAN device and no error occurred;
* %FALSE if the interface was not a VLAN interface or an error occurred
**/
gboolean
nm_system_get_iface_vlan_info (int ifindex,
int *out_master_ifindex,
int *out_parent_ifindex,
int *out_vlan_id)
{
struct nl_sock *nlh;
@ -1561,8 +1561,8 @@ nm_system_get_iface_vlan_info (int ifindex,
lk = rtnl_link_get (cache, ifindex);
if (lk) {
if (out_master_ifindex)
*out_master_ifindex = rtnl_link_get_link (lk);
if (out_parent_ifindex)
*out_parent_ifindex = rtnl_link_get_link (lk);
if (out_vlan_id)
*out_vlan_id = rtnl_link_vlan_get_id (lk);

2
src/nm-system.h
View file

@ -112,7 +112,7 @@ enum {
int nm_system_get_iface_type (int ifindex, const char *name);
gboolean nm_system_get_iface_vlan_info (int ifindex,
int *out_master_ifindex,
int *out_parent_ifindex,
int *out_vlan_id);
gboolean nm_system_add_vlan_iface (NMConnection *connection,