From c21613f4b714fb6015be1b9068927da887eba63a Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Tue, 31 Jan 2012 06:37:59 +0000 Subject: [PATCH] --- yaml --- r: 290069 b: refs/heads/master c: 4bcf053baf6b255e8c82c7ecd0d15954adb0379b h: refs/heads/master i: 290067: 5bdc0adf5c6b69783e4335de05fabc926a43af8e v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000e/mac.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c7764beb7c54..43cc99c12fb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4cbbb04dc115423682349aa7466c8aeead825140 +refs/heads/master: 4bcf053baf6b255e8c82c7ecd0d15954adb0379b diff --git a/trunk/drivers/net/ethernet/intel/e1000e/mac.c b/trunk/drivers/net/ethernet/intel/e1000e/mac.c index e1cf1072f318..33d1b9e3c8d8 100644 --- a/trunk/drivers/net/ethernet/intel/e1000e/mac.c +++ b/trunk/drivers/net/ethernet/intel/e1000e/mac.c @@ -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,