diff --git a/[refs] b/[refs]
index fbd1c289a757..16a4722978ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1ec96af77df611d1728f3bb70289f83a02df1ea
+refs/heads/master: 55dffe79b34e2af98bd1315f1e00c2fc6a7a7078
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 0a632f96d16b..2d1a7404057b 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -13390,6 +13390,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
 	if (err)
 		return err;
 
+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
+	    (tp->pci_chip_rev_id != CHIPREV_ID_5717_A0 ||
+		 (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)))
+		return -ENOTSUPP;
+
 	/* Initialize data/descriptor byte/word swapping. */
 	val = tr32(GRC_MODE);
 	val &= GRC_MODE_HOST_STACKUP;