- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / net / dsa / slave.c

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 2175e6d..8fdca56 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -67,7 +67,7 @@ static int dsa_slave_open(struct net_device *dev)
                return -ENETDOWN;
 
        if (compare_ether_addr(dev->dev_addr, master->dev_addr)) {
-               err = dev_unicast_add(master, dev->dev_addr);
+               err = dev_uc_add(master, dev->dev_addr);
                if (err < 0)
                        goto out;
        }
@@ -90,7 +90,7 @@ clear_allmulti:
                dev_set_allmulti(master, -1);
 del_unicast:
        if (compare_ether_addr(dev->dev_addr, master->dev_addr))
-               dev_unicast_delete(master, dev->dev_addr);
+               dev_uc_del(master, dev->dev_addr);
 out:
        return err;
 }
@@ -101,14 +101,14 @@ static int dsa_slave_close(struct net_device *dev)
        struct net_device *master = p->parent->dst->master_netdev;
 
        dev_mc_unsync(master, dev);
-       dev_unicast_unsync(master, dev);
+       dev_uc_unsync(master, dev);
        if (dev->flags & IFF_ALLMULTI)
                dev_set_allmulti(master, -1);
        if (dev->flags & IFF_PROMISC)
                dev_set_promiscuity(master, -1);
 
        if (compare_ether_addr(dev->dev_addr, master->dev_addr))
-               dev_unicast_delete(master, dev->dev_addr);
+               dev_uc_del(master, dev->dev_addr);
 
        return 0;
 }
@@ -130,7 +130,7 @@ static void dsa_slave_set_rx_mode(struct net_device *dev)
        struct net_device *master = p->parent->dst->master_netdev;
 
        dev_mc_sync(master, dev);
-       dev_unicast_sync(master, dev);
+       dev_uc_sync(master, dev);
 }
 
 static int dsa_slave_set_mac_address(struct net_device *dev, void *a)
@@ -147,13 +147,13 @@ static int dsa_slave_set_mac_address(struct net_device *dev, void *a)
                goto out;
 
        if (compare_ether_addr(addr->sa_data, master->dev_addr)) {
-               err = dev_unicast_add(master, addr->sa_data);
+               err = dev_uc_add(master, addr->sa_data);
                if (err < 0)
                        return err;
        }
 
        if (compare_ether_addr(dev->dev_addr, master->dev_addr))
-               dev_unicast_delete(master, dev->dev_addr);
+               dev_uc_del(master, dev->dev_addr);
 
 out:
        memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);