From 8c3ac9bdd874b9973abdec800f2cfc570232fb8d Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 6 Mar 2012 11:02:55 -0600 Subject: [PATCH] trivial: s/master/parent for VLAN interface info function --- src/nm-system.c | 10 +++++----- src/nm-system.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/nm-system.c b/src/nm-system.c index 27cbcd6767..877c95d37e 100644 --- a/src/nm-system.c +++ b/src/nm-system.c @@ -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); diff --git a/src/nm-system.h b/src/nm-system.h index ac16783579..84ae6c27ed 100644 --- a/src/nm-system.h +++ b/src/nm-system.h @@ -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,