|
@@ -54,15 +54,6 @@
|
|
|
#include <net/pkt_cls.h>
|
|
|
#include <net/tc_act/tc_gact.h>
|
|
|
|
|
|
-#ifdef CONFIG_OF
|
|
|
-#include <linux/of_net.h>
|
|
|
-#endif
|
|
|
-
|
|
|
-#ifdef CONFIG_SPARC
|
|
|
-#include <asm/idprom.h>
|
|
|
-#include <asm/prom.h>
|
|
|
-#endif
|
|
|
-
|
|
|
#include "ixgbe.h"
|
|
|
#include "ixgbe_common.h"
|
|
|
#include "ixgbe_dcb_82599.h"
|
|
@@ -9010,29 +9001,6 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id,
|
|
|
return is_wol_supported;
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * ixgbe_get_platform_mac_addr - Look up MAC address in Open Firmware / IDPROM
|
|
|
- * @adapter: Pointer to adapter struct
|
|
|
- */
|
|
|
-static void ixgbe_get_platform_mac_addr(struct ixgbe_adapter *adapter)
|
|
|
-{
|
|
|
-#ifdef CONFIG_OF
|
|
|
- struct device_node *dp = pci_device_to_OF_node(adapter->pdev);
|
|
|
- struct ixgbe_hw *hw = &adapter->hw;
|
|
|
- const unsigned char *addr;
|
|
|
-
|
|
|
- addr = of_get_mac_address(dp);
|
|
|
- if (addr) {
|
|
|
- ether_addr_copy(hw->mac.perm_addr, addr);
|
|
|
- return;
|
|
|
- }
|
|
|
-#endif /* CONFIG_OF */
|
|
|
-
|
|
|
-#ifdef CONFIG_SPARC
|
|
|
- ether_addr_copy(hw->mac.perm_addr, idprom->id_ethaddr);
|
|
|
-#endif /* CONFIG_SPARC */
|
|
|
-}
|
|
|
-
|
|
|
/**
|
|
|
* ixgbe_probe - Device Initialization Routine
|
|
|
* @pdev: PCI device information struct
|
|
@@ -9304,7 +9272,8 @@ skip_sriov:
|
|
|
goto err_sw_init;
|
|
|
}
|
|
|
|
|
|
- ixgbe_get_platform_mac_addr(adapter);
|
|
|
+ eth_platform_get_mac_address(&adapter->pdev->dev,
|
|
|
+ adapter->hw.mac.perm_addr);
|
|
|
|
|
|
memcpy(netdev->dev_addr, hw->mac.perm_addr, netdev->addr_len);
|
|
|
|