aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 7c7c9a897c09..ec1953043102 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -12747,8 +12747,10 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
12747 if (val & VCPU_CFGSHDW_ASPM_DBNC) 12747 if (val & VCPU_CFGSHDW_ASPM_DBNC)
12748 tg3_flag_set(tp, ASPM_WORKAROUND); 12748 tg3_flag_set(tp, ASPM_WORKAROUND);
12749 if ((val & VCPU_CFGSHDW_WOL_ENABLE) && 12749 if ((val & VCPU_CFGSHDW_WOL_ENABLE) &&
12750 (val & VCPU_CFGSHDW_WOL_MAGPKT)) 12750 (val & VCPU_CFGSHDW_WOL_MAGPKT)) {
12751 tg3_flag_set(tp, WOL_ENABLE); 12751 tg3_flag_set(tp, WOL_ENABLE);
12752 device_set_wakeup_enable(&tp->pdev->dev, true);
12753 }
12752 goto done; 12754 goto done;
12753 } 12755 }
12754 12756
@@ -12881,8 +12883,10 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
12881 tg3_flag_clear(tp, WOL_CAP); 12883 tg3_flag_clear(tp, WOL_CAP);
12882 12884
12883 if (tg3_flag(tp, WOL_CAP) && 12885 if (tg3_flag(tp, WOL_CAP) &&
12884 (nic_cfg & NIC_SRAM_DATA_CFG_WOL_ENABLE)) 12886 (nic_cfg & NIC_SRAM_DATA_CFG_WOL_ENABLE)) {
12885 tg3_flag_set(tp, WOL_ENABLE); 12887 tg3_flag_set(tp, WOL_ENABLE);
12888 device_set_wakeup_enable(&tp->pdev->dev, true);
12889 }
12886 12890
12887 if (cfg2 & (1 << 17)) 12891 if (cfg2 & (1 << 17))
12888 tp->phy_flags |= TG3_PHYFLG_CAPACITIVE_COUPLING; 12892 tp->phy_flags |= TG3_PHYFLG_CAPACITIVE_COUPLING;