Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2023276e authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: WOL fixes 



The first hunk of this patch inverts a flag that was accidentally
toggled as part of commit 0a459aac
("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: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7f3ff4f6

drivers/net/tg3.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

	}