From 5aa5a1136b224a4eaf176ce347bf1b90518fc82e Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sat, 13 Mar 2010 12:22:16 -0800
Subject: [PATCH] --- yaml --- r: 188009 b: refs/heads/master c:
 3f07d1295191cfa41125e4e61ee2064790070071 h: refs/heads/master i:   188007:
 4fcf620c6e1c94f9e685bd90eb45b58f4e450e9b v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 43ae26d39ed3..7783fd8c18dd 100644
--- 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
index c3b4fe74cd6b..22cf1c446de3 100644
--- 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;