aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/tg3.c5
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)
11441 if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) 11441 if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
11442 tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE; 11442 tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE;
11443 } 11443 }
11444 if (nic_cfg & NIC_SRAM_DATA_CFG_APE_ENABLE) 11444
11445 if ((nic_cfg & NIC_SRAM_DATA_CFG_APE_ENABLE) &&
11446 (tp->tg3_flags2 & TG3_FLG2_5750_PLUS))
11445 tp->tg3_flags3 |= TG3_FLG3_ENABLE_APE; 11447 tp->tg3_flags3 |= TG3_FLG3_ENABLE_APE;
11448
11446 if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES && 11449 if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES &&
11447 !(nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL)) 11450 !(nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL))
11448 tp->tg3_flags &= ~TG3_FLAG_WOL_CAP; 11451 tp->tg3_flags &= ~TG3_FLAG_WOL_CAP;