diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2008-12-21 20:18:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-21 20:18:56 -0800 |
| commit | 2023276ebf074a01eb56f38ed4d04deef1deee67 (patch) | |
| tree | 5e5af7f26637298841ca0a2e761f2b929b95ebd6 /drivers/net | |
| parent | 7f3ff4f63f76c2702da6041d2da5eb30fac407f6 (diff) | |
| download | blackbird-op-linux-2023276ebf074a01eb56f38ed4d04deef1deee67.tar.gz blackbird-op-linux-2023276ebf074a01eb56f38ed4d04deef1deee67.zip | |
tg3: WOL fixes
The first hunk of this patch inverts a flag that was accidentally
toggled as part of commit 0a459aac9d151c2e36ec65723b9b845b24c5cbc3
("tg3: Allow WOL for phylib controlled Broadcom phys").
The second hunk of the patch removes the call to
device_may_wakeup() in the 5906 config detection path. At the
point of the call, the driver shouldn't be querying for WOL
capability. It should be detecting and setting it.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/tg3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 06bd2f4eee6c..bacbfc582704 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -2237,7 +2237,7 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state) } } } else { - do_low_power = false; + do_low_power = true; if (tp->link_config.phy_is_low_power == 0) { tp->link_config.phy_is_low_power = 1; @@ -11544,8 +11544,7 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp) if (val & VCPU_CFGSHDW_ASPM_DBNC) tp->tg3_flags |= TG3_FLAG_ASPM_WORKAROUND; if ((val & VCPU_CFGSHDW_WOL_ENABLE) && - (val & VCPU_CFGSHDW_WOL_MAGPKT) && - device_may_wakeup(&tp->pdev->dev)) + (val & VCPU_CFGSHDW_WOL_MAGPKT)) tp->tg3_flags |= TG3_FLAG_WOL_ENABLE; goto done; } |
