diff options
| author | Bill Hayes <bill.hayes@hp.com> | 2007-10-31 15:21:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:03:42 -0800 |
| commit | 93ca161027eb6a1761fb674ad7b995aedccf5f6e (patch) | |
| tree | a1d4dde667d24ff8031607e3098d5e4f96d4614b /drivers/net/e1000e/82571.c | |
| parent | 3df5920c46089b8b1873cb1333248c3e9b01eaf8 (diff) | |
| download | kernel_samsung_aries-93ca161027eb6a1761fb674ad7b995aedccf5f6e.zip kernel_samsung_aries-93ca161027eb6a1761fb674ad7b995aedccf5f6e.tar.gz kernel_samsung_aries-93ca161027eb6a1761fb674ad7b995aedccf5f6e.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net/e1000e/82571.c')
| -rw-r--r-- | drivers/net/e1000e/82571.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c index 14141a5..b6401ab 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; } |