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>

diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
index 62ccd495356e9d9ab832d8bb9c2adfe203194bb3..6d1564f438335cd5656ff35037a91f74ced15e0a 100644 (file)
--- 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 6682206750dcaa24ec33bd9467e489d0a1d7d0f6..e5d23e08650adbab379fecc0df922fcad703eeec 100644 (file)
--- 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);