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

Commit ba94272d authored by Sowmini Varadhan's avatar Sowmini Varadhan Committed by Jeff Kirsher
Browse files

i40e: use eth_platform_get_mac_address() 



This commit converts commit b499ffb0 ("i40e: Look up MAC address in
Open Firmware or IDPROM") to use eth_platform_get_mac_address()
added by commit c7f5d105 ("net: Add eth_platform_get_mac_address()
helper.")

Signed-off-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 72b74869

drivers/net/ethernet/intel/i40e/i40e_main.c

+1 −18
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ 
#include <linux/of_net.h>

#include <linux/pci.h>



#ifdef CONFIG_SPARC

#include <asm/idprom.h>

#include <asm/prom.h>

#endif



/* Local includes */

#include "i40e.h"

#include "i40e_diag.h"
@@ -10618,21 +10613,9 @@ static void i40e_print_features(struct i40e_pf *pf) 
 **/

static void i40e_get_platform_mac_addr(struct pci_dev *pdev, struct i40e_pf *pf)

{

	struct device_node *dp = pci_device_to_OF_node(pdev);

	const unsigned char *addr;

	u8 *mac_addr = pf->hw.mac.addr;



	pf->flags &= ~I40E_FLAG_PF_MAC;

	addr = of_get_mac_address(dp);

	if (addr) {

		ether_addr_copy(mac_addr, addr);

	if (!eth_platform_get_mac_address(&pdev->dev, pf->hw.mac.addr))

		pf->flags |= I40E_FLAG_PF_MAC;

#ifdef CONFIG_SPARC

	} else {

		ether_addr_copy(mac_addr, idprom->id_ethaddr);

		pf->flags |= I40E_FLAG_PF_MAC;

#endif /* CONFIG_SPARC */

	}

}



/**