From 06bac8fcdabf318f486e04aa487396d0fd110789 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Mon, 28 Jan 2013 10:53:16 -0600
Subject: [PATCH] core: return success when port already attached to bridge

Instead of just not logging the error, don't return failure either.
---
 src/nm-system.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/nm-system.c b/src/nm-system.c
index 3bc55bdfae..2f95076612 100644
--- a/src/nm-system.c
+++ b/src/nm-system.c
@@ -2516,9 +2516,14 @@ nm_system_bridge_attach (int master_ifindex,
 	                             mif ? mif : master_iface,
 	                             slave_ifindex,
 	                             sif ? sif : slave_iface);
-	if (err < 0 && err != -EBUSY) {
-		nm_log_err (LOGD_DEVICE, "(%s): failed to attach slave %s: %s",
-		            master_iface, slave_iface, strerror (-err));
+	if (err < 0) {
+		if (err == -EBUSY) {
+			/* Interface already attached to the given bridge */
+			err = 0;
+		} else {
+			nm_log_err (LOGD_DEVICE, "(%s): failed to attach slave %s: %s",
+			            master_iface, slave_iface, strerror (-err));
+		}
 	}
 
 out: