---

yaml --- r: 188009 b: refs/heads/master c: 3f07d12 h: refs/heads/master i: 188007: 4fcf620 v: v3
git-mirror · Mar 13, 2010 · 5aa5a11 · 5aa5a11
1 parent 4b405a6
commit 5aa5a11
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: a003460b21323ddb29479505d9555f0985b8b2f1
+refs/heads/master: 3f07d1295191cfa41125e4e61ee2064790070071
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
@@ -9776,7 +9776,7 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 			   ADVERTISED_Pause |
 			   ADVERTISED_Asym_Pause;
 
-		if (!(tp->tg3_flags2 & TG3_FLAG_10_100_ONLY))
+		if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY))
 			mask |= ADVERTISED_1000baseT_Half |
 				ADVERTISED_1000baseT_Full;