From c8544527b40ed5dae1fb5c9a1fa1385cd20b0359 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Fri, 6 Feb 2009 23:21:51 +0000 Subject: [PATCH] --- yaml --- r: 134345 b: refs/heads/master c: 8675737a9c1bf6c295461efc64898359398e1c82 h: refs/heads/master i: 134343: 92d3af7d37111c418b78626574d7deb9c12db598 v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/e1000_hw.h | 1 - trunk/drivers/net/igb/e1000_mac.c | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 102b55d34d72..631756069e46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa4dfae0ce703976578015902025137d5e268501 +refs/heads/master: 8675737a9c1bf6c295461efc64898359398e1c82 diff --git a/trunk/drivers/net/igb/e1000_hw.h b/trunk/drivers/net/igb/e1000_hw.h index 62ccd495356e..6d1564f43833 100644 --- a/trunk/drivers/net/igb/e1000_hw.h +++ b/trunk/drivers/net/igb/e1000_hw.h @@ -484,7 +484,6 @@ struct e1000_mac_info { bool asf_firmware_present; bool autoneg; bool autoneg_failed; - bool disable_av; bool disable_hw_init_bits; bool get_link_status; bool ifs_params_forced; diff --git a/trunk/drivers/net/igb/e1000_mac.c b/trunk/drivers/net/igb/e1000_mac.c index 6682206750dc..e5d23e08650a 100644 --- a/trunk/drivers/net/igb/e1000_mac.c +++ b/trunk/drivers/net/igb/e1000_mac.c @@ -200,7 +200,8 @@ void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index) rar_high = ((u32) addr[4] | ((u32) addr[5] << 8)); - if (!hw->mac.disable_av) + /* If MAC address zero, no need to set the AV bit */ + if (rar_low || rar_high) rar_high |= E1000_RAH_AV; wr32(E1000_RAL(index), rar_low);