---

yaml --- r: 310775 b: refs/heads/master c: b7abee6 h: refs/heads/master i: 310773: e34a5c9 310771: 3fa3245 310767: ee036f1 v: v3
git-mirror · Jun 11, 2012 · a713da8 · a713da8
1 parent d87c297
commit a713da8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 883ffd6e64114495f68652721065149a2bbd9de6
+refs/heads/master: b7abee6ef888117f92db370620ebf116a38e3f4d
diff --git a/trunk/drivers/net/ethernet/broadcom/tg3.c b/trunk/drivers/net/ethernet/broadcom/tg3.c
@@ -14275,7 +14275,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
 		}
 	}
 
-	if (tg3_flag(tp, 5755_PLUS))
+	if (tg3_flag(tp, 5755_PLUS) ||
+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
 		tg3_flag_set(tp, SHORT_DMA_BUG);
 
 	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)