---

yaml --- r: 247040 b: refs/heads/master c: 1258c07 h: refs/heads/master v: v3
git-mirror · Apr 29, 2011 · 2592f32 · 2592f32
1 parent 26842f2
commit 2592f32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 707394972093e2056e1e8cc39be19cf9bcb3e7b3
+refs/heads/master: 1258c076edcf4a253657320cfc2bd24fd5981d79
diff --git a/trunk/drivers/net/acenic.c b/trunk/drivers/net/acenic.c
@@ -2720,7 +2720,7 @@ static int ace_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 		link |= LNK_NEGOTIATE;
 	if (ethtool_cmd_speed(ecmd) != speed) {
 		link &= ~(LNK_1000MB | LNK_100MB | LNK_10MB);
-		switch (speed) {
+		switch (ethtool_cmd_speed(ecmd)) {
 		case SPEED_1000:
 			link |= LNK_1000MB;
 			break;