From f9f7cd7ee0360f5b82e64f351166b33a5075f5eb Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@tuxdriver.com>
Date: Tue, 5 Oct 2010 03:39:21 +0000
Subject: [PATCH] --- yaml --- r: 211413 b: refs/heads/master c:
 27e6f065df132b5270014d3285889b15185e9da9 h: refs/heads/master i:   211411:
 e78ed6e6d0bb914bfe1a5a306205dcef21e37920 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/bonding/bond_main.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2b31eb9a1f48..fab8a3f1b93c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 392bd0cb000d4aac9e88e4f50823db85e7220688
+refs/heads/master: 27e6f065df132b5270014d3285889b15185e9da9
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
index 3b16f62d5606..e953c6ad6e6d 100644
--- a/trunk/drivers/net/bonding/bond_main.c
+++ b/trunk/drivers/net/bonding/bond_main.c
@@ -5164,6 +5164,15 @@ int bond_create(struct net *net, const char *name)
 		res = dev_alloc_name(bond_dev, "bond%d");
 		if (res < 0)
 			goto out;
+	} else {
+		/*
+		 * If we're given a name to register
+		 * we need to ensure that its not already
+		 * registered
+		 */
+		res = -EEXIST;
+		if (__dev_get_by_name(net, name) != NULL)
+			goto out;
 	}
 
 	res = register_netdevice(bond_dev);