---

yaml --- r: 255335 b: refs/heads/master c: 6f92c66 h: refs/heads/master i: 255333: 1879d83 255331: f09e082 255327: 2b75d66 v: v3
git-mirror · Jun 2, 2011 · 6d3a471 · 6d3a471
1 parent a281850
commit 6d3a471
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afab2d2999e9c12cf319e1f19da9a0a754560d80
+refs/heads/master: 6f92c66f7190b1677ea666249b72298723392115
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
@@ -629,15 +629,8 @@ static int bond_update_speed_duplex(struct slave *slave)
 		return -1;
 
 	slave_speed = ethtool_cmd_speed(&etool);
-	switch (slave_speed) {
-	case SPEED_10:
-	case SPEED_100:
-	case SPEED_1000:
-	case SPEED_10000:
-		break;
-	default:
+	if (slave_speed == 0 || slave_speed == ((__u32) -1))
 		return -1;
-	}
 
 	switch (etool.duplex) {
 	case DUPLEX_FULL: