1 files changed, 23 insertions, 1 deletions

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 35517b06ec3f..a09e3a7cac4f 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1602,6 +1602,28 @@ static int cp_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
         return rc;
 }
 
+static int cp_set_mac_address(struct net_device *dev, void *p)
+{
+        struct cp_private *cp = netdev_priv(dev);
+        struct sockaddr *addr = p;
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EADDRNOTAVAIL;
+
+        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+
+        spin_lock_irq(&cp->lock);
+
+        cpw8_f(Cfg9346, Cfg9346_Unlock);
+        cpw32_f(MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));
+        cpw32_f(MAC0 + 4, le32_to_cpu (*(__le32 *) (dev->dev_addr + 4)));
+        cpw8_f(Cfg9346, Cfg9346_Lock);
+
+        spin_unlock_irq(&cp->lock);
+
+        return 0;
+}
+
 /* Serial EEPROM section. */
 
 /*  EEPROM_Ctrl bits. */
@@ -1821,7 +1843,7 @@ static const struct net_device_ops cp_netdev_ops = {
         .ndo_open               = cp_open,
         .ndo_stop               = cp_close,
         .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_set_mac_address    = cp_set_mac_address,
         .ndo_set_multicast_list = cp_set_rx_mode,
         .ndo_get_stats          = cp_get_stats,
         .ndo_do_ioctl           = cp_ioctl,