From a713da87b4bc742fe1027620fe76f16a8d894ce5 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Thu, 7 Jun 2012 12:56:54 +0000 Subject: [PATCH] --- yaml --- r: 310775 b: refs/heads/master c: b7abee6ef888117f92db370620ebf116a38e3f4d h: refs/heads/master i: 310773: e34a5c99794786cc5b83dec8d208c538a3e0a604 310771: 3fa3245539d1bd37eb94d7359315a6c91bbb9b70 310767: ee036f13fcc16d5f306420944d3d53cbc0bb1a34 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/tg3.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 27054ed8353b..71b61aad32fb 100644 --- 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 index edeeb516807a..e47ff8be1d7b 100644 --- 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)