From 9e0d1c15c47b8215523ebb46fd40c0167f0ca7dc Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Mon, 2 Nov 2009 14:27:02 +0000
Subject: [PATCH] --- yaml --- r: 171126 b: refs/heads/master c:
 c3df0748ee43101dfc5c94d1f61ddfca0ff5baa4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fe3aeb701185..86e5b7140d34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e5f784c77197edf29d2770b518dc78777d5a480
+refs/heads/master: c3df0748ee43101dfc5c94d1f61ddfca0ff5baa4
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 003ab53cf613..d726da8c5930 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -1363,8 +1363,11 @@ static void tg3_adjust_link(struct net_device *dev)
 
 		if (phydev->speed == SPEED_100 || phydev->speed == SPEED_10)
 			mac_mode |= MAC_MODE_PORT_MODE_MII;
-		else
+		else if (phydev->speed == SPEED_1000 ||
+			 GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5785)
 			mac_mode |= MAC_MODE_PORT_MODE_GMII;
+		else
+			mac_mode |= MAC_MODE_PORT_MODE_MII;
 
 		if (phydev->duplex == DUPLEX_HALF)
 			mac_mode |= MAC_MODE_HALF_DUPLEX;