Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 290069
b: refs/heads/master
c: 4bcf053
h: refs/heads/master
i:
  290067: 5bdc0ad
v: v3
  • Loading branch information
Bruce Allan authored and Jeff Kirsher committed Feb 10, 2012
1 parent 27427e8 commit c21613f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4cbbb04dc115423682349aa7466c8aeead825140
refs/heads/master: 4bcf053baf6b255e8c82c7ecd0d15954adb0379b
4 changes: 2 additions & 2 deletions trunk/drivers/net/ethernet/intel/e1000e/mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw)
if (ret_val)
goto out;

/* not supported on older hardware or 82573 */
if ((hw->mac.type < e1000_82571) || (hw->mac.type == e1000_82573))
/* not supported on 82573 */
if (hw->mac.type == e1000_82573)
goto out;

ret_val = e1000_read_nvm(hw, NVM_ALT_MAC_ADDR_PTR, 1,
Expand Down

0 comments on commit c21613f

Please sign in to comment.