From 59c3714a494c3b3765657c0551ad82842d98a7d2 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sat, 26 Apr 2014 20:55:09 +0200 Subject: Imported Upstream version 0.9.8.10 --- src/nm-system.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/nm-system.c') diff --git a/src/nm-system.c b/src/nm-system.c index 7f6de912..39983424 100644 --- a/src/nm-system.c +++ b/src/nm-system.c @@ -1696,15 +1696,15 @@ nm_system_bond_enslave (gint master_ifindex, g_assert (!nm_system_iface_is_up (slave_ifindex)); if (nm_system_iface_get_flags (slave_ifindex) & IFF_SLAVE) { - struct rtnl_link *link; + struct rtnl_link *lk; int existing_master = -1; /* Get the ifindex of the existing master device */ - link = nm_netlink_index_to_rtnl_link (slave_ifindex); - g_warn_if_fail (link != NULL); - if (link) { - existing_master = rtnl_link_get_master (link); - rtnl_link_put (link); + lk = nm_netlink_index_to_rtnl_link (slave_ifindex); + g_warn_if_fail (lk != NULL); + if (lk) { + existing_master = rtnl_link_get_master (lk); + rtnl_link_put (lk); } if (existing_master > 0) { -- cgit 1.3.0-6-gf8a5