From 93ca161027eb6a1761fb674ad7b995aedccf5f6e Mon Sep 17 00:00:00 2001
From: Bill Hayes <bill.hayes@hp.com>
Date: Wed, 31 Oct 2007 15:21:52 -0700
Subject: e1000e: alternate MAC address support

Port alternate MAC address support from the sourceforge
e1000 driver to the upstream e1000e driver.

Signed-off-by: Bill Hayes <bill.hayes@hp.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---
 drivers/net/e1000e/82571.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'drivers/net/e1000e/82571.c')

diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 14141a55eaa..b6401abc17d 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -752,6 +752,10 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
 	ew32(IMC, 0xffffffff);
 	icr = er32(ICR);
 
+	if (hw->mac.type == e1000_82571 &&
+		hw->dev_spec.e82571.alt_mac_addr_is_present)
+			e1000e_set_laa_state_82571(hw, true);
+
 	return 0;
 }
 
-- 
cgit v1.2.3