diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2011-07-22 06:21:51 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-15 18:31:42 -0700 |
| commit | 716ae31687f2d778ff9a18e7286deca992dfa955 (patch) | |
| tree | 5ff08d4a7ea726802854cd2d070ef514323e137d /drivers/net/e1000e | |
| parent | 8b180803c66ccc825d2969c1ea9929fcb7fba98e (diff) | |
| download | kernel_samsung_smdk4412-716ae31687f2d778ff9a18e7286deca992dfa955.zip kernel_samsung_smdk4412-716ae31687f2d778ff9a18e7286deca992dfa955.tar.gz kernel_samsung_smdk4412-716ae31687f2d778ff9a18e7286deca992dfa955.tar.bz2 | |
e1000e: alternate MAC address does not work on device id 0x1060
commit c407bee8a56d874b91f3e4ee790660959ff1a25e upstream.
This issue is present all the way back to 2.6.34 kernels.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeffrey Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/e1000e')
| -rw-r--r-- | drivers/net/e1000e/lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index dd8ab05..8d28602 100644 --- 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, |