diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2008-11-03 16:52:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-03 16:52:32 -0800 |
| commit | b2b98d4acc58a6f36b731e666c6ebd901cd6a27e (patch) | |
| tree | f455300c0b87b99a91e720709e178c7a9a0d1611 /drivers/net/tg3.c | |
| parent | bcb37f6cb57e565e7bd342272652c3a50cf88761 (diff) | |
| download | op-kernel-dev-b2b98d4acc58a6f36b731e666c6ebd901cd6a27e.zip op-kernel-dev-b2b98d4acc58a6f36b731e666c6ebd901cd6a27e.tar.gz | |
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>
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 45fcbc3..978d1f0 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; |
