]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
net: emacps: Use generic eth_mac_addr instead of private one
authorMichal Simek <michal.simek@xilinx.com>
Mon, 11 Aug 2014 11:33:13 +0000 (13:33 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 12 Aug 2014 09:40:20 +0000 (11:40 +0200)
Use predefined ethernet function for changing mac address.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
drivers/net/ethernet/xilinx/xilinx_emacps.c

index ac359cbab76b90a954b12396f807a2c62f85117c..24a99b021186492853ca68358642f174c692a900 100644 (file)
@@ -2158,33 +2158,6 @@ static void xemacps_tx_timeout(struct net_device *ndev)
        queue_work(lp->txtimeout_handler_wq, &lp->txtimeout_reinit);
 }
 
-/**
- * xemacps_set_mac_address - set network interface mac address
- * @ndev: network interface device structure
- * @addr: pointer to MAC address
- * Return: 0 on success, negative value if error
- */
-static int xemacps_set_mac_address(struct net_device *ndev, void *addr)
-{
-       struct net_local *lp = netdev_priv(ndev);
-       struct sockaddr *hwaddr = (struct sockaddr *)addr;
-
-       if (netif_running(ndev))
-               return -EBUSY;
-
-       if (!is_valid_ether_addr(hwaddr->sa_data))
-               return -EADDRNOTAVAIL;
-
-       dev_dbg(&lp->pdev->dev, "hwaddr 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",
-               hwaddr->sa_data[0], hwaddr->sa_data[1], hwaddr->sa_data[2],
-               hwaddr->sa_data[3], hwaddr->sa_data[4], hwaddr->sa_data[5]);
-
-       memcpy(ndev->dev_addr, hwaddr->sa_data, ndev->addr_len);
-
-       xemacps_set_hwaddr(lp);
-       return 0;
-}
-
 /**
  * xemacps_clear_csum - Clear the csum field for  transport protocols
  * @skb: socket buffer
@@ -3121,7 +3094,7 @@ static struct net_device_ops netdev_ops = {
        .ndo_stop               = xemacps_close,
        .ndo_start_xmit         = xemacps_start_xmit,
        .ndo_set_rx_mode        = xemacps_set_rx_mode,
-       .ndo_set_mac_address    = xemacps_set_mac_address,
+       .ndo_set_mac_address    = eth_mac_addr,
        .ndo_do_ioctl           = xemacps_ioctl,
        .ndo_change_mtu         = eth_change_mtu,
        .ndo_tx_timeout         = xemacps_tx_timeout,