---

yaml --- r: 214298 b: refs/heads/master c: d1fb627 h: refs/heads/master v: v3
git-mirror · Sep 7, 2010 · dce04f0 · dce04f0
1 parent 325a772
commit dce04f0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fbfca013176f9b90d186f3b446fd93e4d972b25
+refs/heads/master: d1fb62796cdac6899ebd4319e4a610684db063e9
diff --git a/trunk/net/tipc/eth_media.c b/trunk/net/tipc/eth_media.c
@@ -142,6 +142,16 @@ static int enable_bearer(struct tipc_bearer *tb_ptr)
 	struct eth_bearer *eb_ptr = &eth_bearers[0];
 	struct eth_bearer *stop = &eth_bearers[MAX_ETH_BEARERS];
 	char *driver_name = strchr((const char *)tb_ptr->name, ':') + 1;
+	int pending_dev = 0;
+
+	/* Find unused Ethernet bearer structure */
+
+	while (eb_ptr->dev) {
+		if (!eb_ptr->bearer)
+			pending_dev++;
+		if (++eb_ptr == stop)
+			return pending_dev ? -EAGAIN : -EDQUOT;
+	}
 
 	/* Find device with specified name */