---

yaml --- r: 211413 b: refs/heads/master c: 27e6f06 h: refs/heads/master i: 211411: e78ed6e v: v3
git-mirror · Oct 6, 2010 · f9f7cd7 · f9f7cd7
1 parent 4c5c1c4
commit f9f7cd7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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);