From 8240226c89eda4c43975c84b024dab4082882b4d Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Sat, 5 Jun 2010 17:24:35 +0000
Subject: [PATCH] --- yaml --- r: 202681 b: refs/heads/master c:
 57d8b88030ca9f295bb72ef65228c6d86bed22f6 h: refs/heads/master i:   202679:
 a9b237f8080ea76fc8a4ad34c765168527e81569 v: v3

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

diff --git a/[refs] b/[refs]
index 76a109c2a71d..e4f49caf5be5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2430b031be8d3eb57f22f2df6fb3784564109db0
+refs/heads/master: 57d8b88030ca9f295bb72ef65228c6d86bed22f6
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index d169337bc7ef..2dcde1343cc7 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -4206,6 +4206,8 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)
 					current_duplex = DUPLEX_FULL;
 				else
 					current_duplex = DUPLEX_HALF;
+			} else if (!(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
+				/* Link is up via parallel detect */
 			} else {
 				current_link_up = 0;
 			}
@@ -8531,8 +8533,10 @@ static void tg3_timer(unsigned long __opaque)
 				}
 				tg3_setup_phy(tp, 0);
 			}
-		} else if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)
+		} else if ((tp->tg3_flags2 & TG3_FLG2_MII_SERDES) &&
+			   !(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
 			tg3_serdes_parallel_detect(tp);
+		}
 
 		tp->timer_counter = tp->timer_multiplier;
 	}