diff --git a/[refs] b/[refs] index 2e3028288b90..0255b5dc25e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ee62630fddda0142cebc45e3bbea20a8009be97 +refs/heads/master: a6435f3a53746a0eb687a9f636cf1941f35f935e diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 67630fb8272e..c7bbbb19f000 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -1473,7 +1473,8 @@ static void tg3_phy_toggle_apd(struct tg3 *tp, bool enable) { u32 reg; - if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS)) + if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) || + GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) return; reg = MII_TG3_MISC_SHDW_WREN |