From db7ba1c161e1811bf361cf3410477b44eba24d78 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 27 Feb 2013 15:41:07 +0100
Subject: [PATCH] trivial: rename 'link' to avoid shadowing a global
 variable/function

nm-system.c: In function "nm_system_bond_enslave":
nm-system.c:1689:21: error: declaration of "link" shadows a global declaration [-Werror=shadow]
---
 src/nm-system.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/nm-system.c b/src/nm-system.c
index 1a2f93828d..00ac377786 100644
--- a/src/nm-system.c
+++ b/src/nm-system.c
@@ -1686,15 +1686,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 *l;
 		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);
+		l = nm_netlink_index_to_rtnl_link (slave_ifindex);
+		g_warn_if_fail (l != NULL);
+		if (l) {
+			existing_master = rtnl_link_get_master (l);
+			rtnl_link_put (l);
 		}
 
 		if (existing_master > 0) {