mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
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>
This commit is contained in:
parent
bcb37f6cb5
commit
b2b98d4acc
1 changed files with 4 additions and 1 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue