diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-02-06 23:21:51 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-07 02:43:15 -0800 |
| commit | 8675737a9c1bf6c295461efc64898359398e1c82 (patch) | |
| tree | 2a1c39034746580647050e9fa9e8c9eb039050f7 | |
| parent | fa4dfae0ce703976578015902025137d5e268501 (diff) | |
| download | blackbird-op-linux-8675737a9c1bf6c295461efc64898359398e1c82.tar.gz blackbird-op-linux-8675737a9c1bf6c295461efc64898359398e1c82.zip | |
igb: remove disable_av variable from mac_info struct
The disable_av variable is never used by the driver and provides no value as
it is likely a leftover debugging variable. I have removed it and replaced
the one spot that checked for it with a check for a valid address.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/igb/e1000_hw.h | 1 | ||||
| -rw-r--r-- | drivers/net/igb/e1000_mac.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h index 62ccd495356e..6d1564f43833 100644 --- a/drivers/net/igb/e1000_hw.h +++ b/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/drivers/net/igb/e1000_mac.c b/drivers/net/igb/e1000_mac.c index 6682206750dc..e5d23e08650a 100644 --- a/drivers/net/igb/e1000_mac.c +++ b/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); |
