Commit daba2a63 authored Apr 20, 2009 by Matt Carlson Committed by David S. Miller Apr 21, 2009

tg3: Restore LAA sooner in shutdown sequence



After a shutdown reset, the LAA needs to be restored before posting the
post-reset signature in shared memory.  If the LAA is not restored
before then, the bootcode will assume the factory default MAC address
and WOL will not work with the LAA.

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>

parent 9cf74ebb

drivers/net/tg3.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2456,8 +2456,6 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
		}
		}

		__tg3_set_mac_addr(tp, 0);

		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
		u32 val;

		@@ -6357,6 +6355,8 @@ static int tg3_halt(struct tg3 *tp, int kind, int silent)
		tg3_abort_hw(tp, silent);
		err = tg3_chip_reset(tp);

		__tg3_set_mac_addr(tp, 0);

		tg3_write_sig_legacy(tp, kind);
		tg3_write_sig_post_reset(tp, kind);