projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa02bc7
)
e1000e: alternate MAC address does not work on device id 0x1060
author
Bruce Allan
<
[email protected]
>
Fri, 22 Jul 2011 06:21:51 +0000
(06:21 +0000)
committer
Jeff Kirsher
<
[email protected]
>
Thu, 11 Aug 2011 22:16:28 +0000
(15:16 -0700)
This issue is present all the way back to 2.6.34 kernels.
CC: <
[email protected]
>
Signed-off-by: Bruce Allan <
[email protected]
>
Tested-by: Jeffrey Pieper <
[email protected]
>
Signed-off-by: Jeff Kirsher <
[email protected]
>
drivers/net/e1000e/lib.c
patch
|
blob
|
history
diff --git
a/drivers/net/e1000e/lib.c
b/drivers/net/e1000e/lib.c
index 7898a67d6505478036e19e790ebeb1a1f2295445..58af091c8c3ac2aa326f39c8697006200bf3a992 100644
(file)
--- a/
drivers/net/e1000e/lib.c
+++ b/
drivers/net/e1000e/lib.c
@@
-190,7
+190,8
@@
s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw)
/* Check for LOM (vs. NIC) or one of two valid mezzanine cards */
if (!((nvm_data & NVM_COMPAT_LOM) ||
(hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_DUAL) ||
- (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD)))
+ (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD) ||
+ (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES)))
goto out;
ret_val = e1000_read_nvm(hw, NVM_ALT_MAC_ADDR_PTR, 1,