fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 17:50:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: clarify bond enslave/release function names

Browse source
This commit is contained in:
Dan Williams 2012-11-14 14:24:34 -06:00
parent b50a141fb7
commit 1472532f28
3 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/nm-device-bond.c
View file

@ -385,10 +385,10 @@ enslave_slave (NMDevice *device, NMDevice *slave, NMConnection *connection)
nm_device_hw_take_down (slave, TRUE);
success = nm_system_iface_enslave (nm_device_get_ip_ifindex (device),
nm_device_get_ip_iface (device),
nm_device_get_ip_ifindex (slave),
nm_device_get_ip_iface (slave));
success = nm_system_bond_enslave (nm_device_get_ip_ifindex (device),
nm_device_get_ip_iface (device),
nm_device_get_ip_ifindex (slave),
nm_device_get_ip_iface (slave));
if (success) {
SlaveInfo *sinfo;
@ -423,10 +423,10 @@ release_slave (NMDevice *device, NMDevice *slave)
if (!sinfo)
return FALSE;
success = nm_system_iface_release (nm_device_get_ip_ifindex (device),
nm_device_get_ip_iface (device),
nm_device_get_ip_ifindex (slave),
nm_device_get_ip_iface (slave));
success = nm_system_bond_release (nm_device_get_ip_ifindex (device),
nm_device_get_ip_iface (device),
nm_device_get_ip_ifindex (slave),
nm_device_get_ip_iface (slave));
nm_log_dbg (LOGD_BOND, "(%s): released bond slave %s (success %d)",
nm_device_get_ip_iface (device),
nm_device_get_ip_iface (slave),

28
src/nm-system.c
View file

@ -1620,7 +1620,7 @@ nm_system_add_bonding_master (const char *iface)
}
static gboolean
nm_system_iface_compat_enslave (const char *master_iface, const char *slave_iface)
nm_system_bond_compat_enslave (const char *master_iface, const char *slave_iface)
{
struct ifreq ifr;
int fd;
@ -1650,7 +1650,7 @@ nm_system_iface_compat_enslave (const char *master_iface, const char *slave_ifac
}
/**
* nm_system_iface_enslave:
* nm_system_bond_enslave:
* @master_ifindex: master device interface index
* @master_iface: master device interface name
* @slave_ifindex: slave device interface index
@ -1666,10 +1666,10 @@ nm_system_iface_compat_enslave (const char *master_iface, const char *slave_ifac
* Returns: %TRUE on success, or %FALSE
*/
gboolean
nm_system_iface_enslave (gint master_ifindex,
const char *master_iface,
gint slave_ifindex,
const char *slave_iface)
nm_system_bond_enslave (gint master_ifindex,
const char *master_iface,
gint slave_ifindex,
const char *slave_iface)
{
struct nl_sock *sock;
int err;
@ -1696,7 +1696,7 @@ nm_system_iface_enslave (gint master_ifindex,
err = rtnl_link_bond_enslave_ifindex (sock, master_ifindex, slave_ifindex);
if (err == -NLE_OPNOTSUPP)
return nm_system_iface_compat_enslave (master_iface, slave_iface);
return nm_system_bond_compat_enslave (master_iface, slave_iface);
if (err < 0) {
nm_log_err (LOGD_DEVICE, "(%s): error enslaving %s: %d (%s)",
@ -1708,7 +1708,7 @@ nm_system_iface_enslave (gint master_ifindex,
}
static gboolean
nm_system_iface_compat_release (const char *master_iface, const char *slave_iface)
nm_system_bond_compat_release (const char *master_iface, const char *slave_iface)
{
struct ifreq ifr;
int fd;
@ -1737,7 +1737,7 @@ nm_system_iface_compat_release (const char *master_iface, const char *slave_ifac
}
/**
* nm_system_iface_release:
* nm_system_bond_release:
* @master_ifindex: master device interface index
* @master_iface: master device interface name
* @slave_ifindex: slave device interface index
@ -1751,10 +1751,10 @@ nm_system_iface_compat_release (const char *master_iface, const char *slave_ifac
* Returns: %TRUE on success, or %FALSE
*/
gboolean
nm_system_iface_release (gint master_ifindex,
const char *master_iface,
gint slave_ifindex,
const char *slave_iface)
nm_system_bond_release (gint master_ifindex,
const char *master_iface,
gint slave_ifindex,
const char *slave_iface)
{
struct nl_sock *sock;
int err;
@ -1772,7 +1772,7 @@ nm_system_iface_release (gint master_ifindex,
err = rtnl_link_bond_release_ifindex (sock, slave_ifindex);
if (err == -NLE_OPNOTSUPP)
return nm_system_iface_compat_release (master_iface, slave_iface);
return nm_system_bond_compat_release (master_iface, slave_iface);
else if (err < 0) {
nm_log_err (LOGD_DEVICE, "(%s): error releasing slave %s: %d (%s)",
master_iface, slave_iface, err, nl_geterror (err));

4
src/nm-system.h
View file

@ -100,11 +100,11 @@ gboolean nm_system_apply_bonding_config (const char *iface,
NMSettingBond *s_bond);
gboolean nm_system_add_bonding_master (const char *iface);
gboolean nm_system_iface_enslave (gint master_ifindex,
gboolean nm_system_bond_enslave (gint master_ifindex,
const char *master_iface,
gint slave_ifindex,
const char *slave_iface);
gboolean nm_system_iface_release (gint master_ifindex,
gboolean nm_system_bond_release (gint master_ifindex,
const char *master_iface,
gint slave_ifindex,
const char *slave_iface);