|
@@ -764,39 +764,6 @@ static s32 igb_get_pcs_speed_and_duplex_82575(struct e1000_hw *hw, u16 *speed,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * igb_init_rx_addrs_82575 - Initialize receive address's
|
|
|
- * @hw: pointer to the HW structure
|
|
|
- * @rar_count: receive address registers
|
|
|
- *
|
|
|
- * Setups the receive address registers by setting the base receive address
|
|
|
- * register to the devices MAC address and clearing all the other receive
|
|
|
- * address registers to 0.
|
|
|
- **/
|
|
|
-static void igb_init_rx_addrs_82575(struct e1000_hw *hw, u16 rar_count)
|
|
|
-{
|
|
|
- u32 i;
|
|
|
- u8 addr[6] = {0,0,0,0,0,0};
|
|
|
- /*
|
|
|
- * This function is essentially the same as that of
|
|
|
- * e1000_init_rx_addrs_generic. However it also takes care
|
|
|
- * of the special case where the register offset of the
|
|
|
- * second set of RARs begins elsewhere. This is implicitly taken care by
|
|
|
- * function e1000_rar_set_generic.
|
|
|
- */
|
|
|
-
|
|
|
- hw_dbg("e1000_init_rx_addrs_82575");
|
|
|
-
|
|
|
- /* Setup the receive address */
|
|
|
- hw_dbg("Programming MAC Address into RAR[0]\n");
|
|
|
- hw->mac.ops.rar_set(hw, hw->mac.addr, 0);
|
|
|
-
|
|
|
- /* Zero out the other (rar_entry_count - 1) receive addresses */
|
|
|
- hw_dbg("Clearing RAR[1-%u]\n", rar_count-1);
|
|
|
- for (i = 1; i < rar_count; i++)
|
|
|
- hw->mac.ops.rar_set(hw, addr, i);
|
|
|
-}
|
|
|
-
|
|
|
/**
|
|
|
* igb_shutdown_fiber_serdes_link_82575 - Remove link during power down
|
|
|
* @hw: pointer to the HW structure
|
|
@@ -889,7 +856,8 @@ static s32 igb_reset_hw_82575(struct e1000_hw *hw)
|
|
|
wr32(E1000_IMC, 0xffffffff);
|
|
|
icr = rd32(E1000_ICR);
|
|
|
|
|
|
- igb_check_alt_mac_addr(hw);
|
|
|
+ /* Install any alternate MAC address into RAR0 */
|
|
|
+ ret_val = igb_check_alt_mac_addr(hw);
|
|
|
|
|
|
return ret_val;
|
|
|
}
|
|
@@ -918,7 +886,8 @@ static s32 igb_init_hw_82575(struct e1000_hw *hw)
|
|
|
igb_clear_vfta(hw);
|
|
|
|
|
|
/* Setup the receive address */
|
|
|
- igb_init_rx_addrs_82575(hw, rar_count);
|
|
|
+ igb_init_rx_addrs(hw, rar_count);
|
|
|
+
|
|
|
/* Zero out the Multicast HASH table */
|
|
|
hw_dbg("Zeroing the MTA\n");
|
|
|
for (i = 0; i < mac->mta_reg_count; i++)
|