Commit ec356ede authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

ethernet: ixgb: use eth_hw_addr_set() 



Commit 406f42fa ("net-next: When a bond have a massive amount
of VLANs...") introduced a rbtree for faster Ethernet address look
up. To maintain netdev->dev_addr in this tree we need to make all
the writes to it got through appropriate helpers.

Read the address into an array on the stack, then call
eth_hw_addr_set(). ixgb_get_ee_mac_addr() is used with
a non-nevdev->dev_addr pointer so we can't deal with the problem
inside it.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c8b3485

drivers/net/ethernet/intel/ixgb/ixgb_main.c

+6 −2
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct ixgb_adapter *adapter;

	static int cards_found = 0;

	int pci_using_dac;

	u8 addr[ETH_ALEN];

	int i;

	int err;
@@ -461,7 +462,8 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_eeprom;

	}



	ixgb_get_ee_mac_addr(&adapter->hw, netdev->dev_addr);

	ixgb_get_ee_mac_addr(&adapter->hw, addr);

	eth_hw_addr_set(netdev, addr);



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

		netif_err(adapter, probe, adapter->netdev, "Invalid MAC Address\n");
@@ -2227,6 +2229,7 @@ static pci_ers_result_t ixgb_io_slot_reset(struct pci_dev *pdev) 
{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct ixgb_adapter *adapter = netdev_priv(netdev);

	u8 addr[ETH_ALEN];



	if (pci_enable_device(pdev)) {

		netif_err(adapter, probe, adapter->netdev,
@@ -2250,7 +2253,8 @@ static pci_ers_result_t ixgb_io_slot_reset(struct pci_dev *pdev) 
			  "After reset, the EEPROM checksum is not valid\n");

		return PCI_ERS_RESULT_DISCONNECT;

	}

	ixgb_get_ee_mac_addr(&adapter->hw, netdev->dev_addr);

	ixgb_get_ee_mac_addr(&adapter->hw, addr);

	eth_hw_addr_set(netdev, addr);

	memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);



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