Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8ebc683 authored by Joe Perches's avatar Joe Perches Committed by Jeff Kirsher
Browse files

ixgbe: Use is_valid_ether_addr 



Use the normal kernel test instead of a module specific one.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b93196dc

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+1 −1
Original line number Diff line number Diff line
@@ -1078,7 +1078,7 @@ mac_reset_top: 
	hw->mac.ops.get_san_mac_addr(hw, hw->mac.san_addr);



	/* Add the SAN MAC address to the RAR only if it's a valid address */

	if (ixgbe_validate_mac_addr(hw->mac.san_addr) == 0) {

	if (is_valid_ether_addr(hw->mac.san_addr)) {

		hw->mac.ops.set_rar(hw, hw->mac.num_rar_entries - 1,

		                    hw->mac.san_addr, 0, IXGBE_RAH_AV);

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

+1 −25
Original line number Diff line number Diff line
@@ -1782,29 +1782,6 @@ s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw) 
	return status;

}



/**

 *  ixgbe_validate_mac_addr - Validate MAC address

 *  @mac_addr: pointer to MAC address.

 *

 *  Tests a MAC address to ensure it is a valid Individual Address

 **/

s32 ixgbe_validate_mac_addr(u8 *mac_addr)

{

	s32 status = 0;



	/* Make sure it is not a multicast address */

	if (IXGBE_IS_MULTICAST(mac_addr))

		status = IXGBE_ERR_INVALID_MAC_ADDR;

	/* Not a broadcast address */

	else if (IXGBE_IS_BROADCAST(mac_addr))

		status = IXGBE_ERR_INVALID_MAC_ADDR;

	/* Reject the zero address */

	else if (is_zero_ether_addr(mac_addr))

		status = IXGBE_ERR_INVALID_MAC_ADDR;



	return status;

}



/**

 *  ixgbe_set_rar_generic - Set Rx address register

 *  @hw: pointer to hardware structure
@@ -1909,8 +1886,7 @@ s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw) 
	 * to the permanent address.

	 * Otherwise, use the permanent address from the eeprom.

	 */

	if (ixgbe_validate_mac_addr(hw->mac.addr) ==

	    IXGBE_ERR_INVALID_MAC_ADDR) {

	if (!is_valid_ether_addr(hw->mac.addr)) {

		/* Get the MAC address from the RAR0 for later reference */

		hw->mac.ops.get_mac_addr(hw, hw->mac.addr);

drivers/net/ethernet/intel/ixgbe/ixgbe_common.h

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw); 
s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw);

void ixgbe_fc_autoneg(struct ixgbe_hw *hw);



s32 ixgbe_validate_mac_addr(u8 *mac_addr);

s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask);

void ixgbe_release_swfw_sync(struct ixgbe_hw *hw, u16 mask);

s32 ixgbe_get_san_mac_addr_generic(struct ixgbe_hw *hw, u8 *san_mac_addr);

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −1
Original line number Diff line number Diff line
@@ -7444,7 +7444,7 @@ static int ixgbe_probe(struct pci_dev *pdev, 
	memcpy(netdev->dev_addr, hw->mac.perm_addr, netdev->addr_len);

	memcpy(netdev->perm_addr, hw->mac.perm_addr, netdev->addr_len);



	if (ixgbe_validate_mac_addr(netdev->perm_addr)) {

	if (!is_valid_ether_addr(netdev->perm_addr)) {

		e_dev_err("invalid MAC address\n");

		err = -EIO;

		goto err_sw_init;

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

+0 −9
Original line number Diff line number Diff line
@@ -1834,15 +1834,6 @@ enum { 
/* Number of 100 microseconds we wait for PCI Express master disable */

#define IXGBE_PCI_MASTER_DISABLE_TIMEOUT 800



/* Check whether address is multicast.  This is little-endian specific check.*/

#define IXGBE_IS_MULTICAST(Address) \

                (bool)(((u8 *)(Address))[0] & ((u8)0x01))



/* Check whether an address is broadcast. */

#define IXGBE_IS_BROADCAST(Address)                      \

                ((((u8 *)(Address))[0] == ((u8)0xff)) && \

                (((u8 *)(Address))[1] == ((u8)0xff)))



/* RAH */

#define IXGBE_RAH_VIND_MASK     0x003C0000

#define IXGBE_RAH_VIND_SHIFT    18