tg3: Do not enable APE on bcm5700

With older versions of the NVRAM format, the driver may mistakenly
determine that APE is enabled.  Make sure this doesn't happen by
restricting the ENABLE_APE check to devices known to have more
recent NVRAM image formats.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 45fcbc3b141d..978d1f0ccb7d 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -11441,8 +11441,11 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                         if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
                                 tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE;
                 }
-                if (nic_cfg & NIC_SRAM_DATA_CFG_APE_ENABLE)
+
+                if ((nic_cfg & NIC_SRAM_DATA_CFG_APE_ENABLE) &&
+                        (tp->tg3_flags2 & TG3_FLG2_5750_PLUS))
                         tp->tg3_flags3 |= TG3_FLG3_ENABLE_APE;
+
                 if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES &&
                     !(nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL))
                         tp->tg3_flags &= ~TG3_FLAG_WOL_CAP;