---

yaml --- r: 171126 b: refs/heads/master c: c3df074 h: refs/heads/master v: v3
git-mirror · Nov 3, 2009 · 9e0d1c1 · 9e0d1c1
1 parent 51b0670
commit 9e0d1c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;