ethernet: use eth_hw_addr_set() instead of ether_addr_copy()

[linux-2.6-microblaze.git] / drivers / net / ethernet / qualcomm / emac / emac.c

diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c
index ad655f0..fbfabfc 100644 (file)
--- a/drivers/net/ethernet/qualcomm/emac/emac.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac.c
@@ -377,7 +377,7 @@ static const struct net_device_ops emac_netdev_ops = {
        .ndo_start_xmit         = emac_start_xmit,
        .ndo_set_mac_address    = eth_mac_addr,
        .ndo_change_mtu         = emac_change_mtu,
-       .ndo_do_ioctl           = phy_do_ioctl_running,
+       .ndo_eth_ioctl          = phy_do_ioctl_running,
        .ndo_tx_timeout         = emac_tx_timeout,
        .ndo_get_stats64        = emac_get_stats64,
        .ndo_set_features       = emac_set_features,
@@ -550,7 +550,7 @@ static int emac_probe_resources(struct platform_device *pdev,
 
        /* get mac address */
        if (device_get_mac_address(&pdev->dev, maddr, ETH_ALEN))
-               ether_addr_copy(netdev->dev_addr, maddr);
+               eth_hw_addr_set(netdev, maddr);
        else
                eth_hw_addr_random(netdev);