Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / sundance.c

diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index b409d7ec4ac15ff5e5eb82c2aff17111d48954a3..4793df843c247794a285b2bd574653a9e46d6098 100644 (file)
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -294,6 +294,9 @@ enum alta_offsets {
        /* Aliased and bogus values! */
        RxStatus = 0x0c,
 };
+
+#define ASIC_HI_WORD(x)        ((x) + 2)
+
 enum ASICCtrl_HiWord_bit {
        GlobalReset = 0x0001,
        RxReset = 0x0002,
@@ -431,6 +434,7 @@ static void netdev_error(struct net_device *dev, int intr_status);
 static void netdev_error(struct net_device *dev, int intr_status);
 static void set_rx_mode(struct net_device *dev);
 static int __set_mac_addr(struct net_device *dev);
+static int sundance_set_mac_addr(struct net_device *dev, void *data);
 static struct net_device_stats *get_stats(struct net_device *dev);
 static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static int  netdev_close(struct net_device *dev);
@@ -464,7 +468,7 @@ static const struct net_device_ops netdev_ops = {
        .ndo_do_ioctl           = netdev_ioctl,
        .ndo_tx_timeout         = tx_timeout,
        .ndo_change_mtu         = change_mtu,
-       .ndo_set_mac_address    = eth_mac_addr,
+       .ndo_set_mac_address    = sundance_set_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,
 };
 
@@ -1592,6 +1596,19 @@ static int __set_mac_addr(struct net_device *dev)
        return 0;
 }
 
+/* Invoked with rtnl_lock held */
+static int sundance_set_mac_addr(struct net_device *dev, void *data)
+{
+       const struct sockaddr *addr = data;
+
+       if (!is_valid_ether_addr(addr->sa_data))
+               return -EINVAL;
+       memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+       __set_mac_addr(dev);
+
+       return 0;
+}
+
 static const struct {
        const char name[ETH_GSTRING_LEN];
 } sundance_stats[] = {
@@ -1772,10 +1789,10 @@ static int netdev_close(struct net_device *dev)
        }
 
        iowrite16(GlobalReset | DMAReset | FIFOReset | NetworkReset,
-                       ioaddr +ASICCtrl + 2);
+                       ioaddr + ASIC_HI_WORD(ASICCtrl));
 
        for (i = 2000; i > 0; i--) {
-               if ((ioread16(ioaddr + ASICCtrl +2) & ResetBusy) == 0)
+               if ((ioread16(ioaddr + ASIC_HI_WORD(ASICCtrl)) & ResetBusy) == 0)
                        break;
                mdelay(1);
        }