3 files changed, 13 insertions, 13 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index f8ab60b914c4..d6ae63b2cf00 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1491,7 +1491,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                         }
 
                         /* Flush unicast and multicast addresses */
-                        dev_unicast_flush(bond_dev);
+                        dev_uc_flush(bond_dev);
                         dev_addr_discard(bond_dev);
 
                         if (slave_dev->type != ARPHRD_ETHER)
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 445e73c343ba..9a939d828b47 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -282,7 +282,7 @@ static int macvlan_open(struct net_device *dev)
         if (macvlan_addr_busy(vlan->port, dev->dev_addr))
                 goto out;
 
-        err = dev_unicast_add(lowerdev, dev->dev_addr);
+        err = dev_uc_add(lowerdev, dev->dev_addr);
         if (err < 0)
                 goto out;
         if (dev->flags & IFF_ALLMULTI) {
@@ -294,7 +294,7 @@ static int macvlan_open(struct net_device *dev)
         return 0;
 
 del_unicast:
-        dev_unicast_delete(lowerdev, dev->dev_addr);
+        dev_uc_del(lowerdev, dev->dev_addr);
 out:
         return err;
 }
@@ -308,7 +308,7 @@ static int macvlan_stop(struct net_device *dev)
         if (dev->flags & IFF_ALLMULTI)
                 dev_set_allmulti(lowerdev, -1);
 
-        dev_unicast_delete(lowerdev, dev->dev_addr);
+        dev_uc_del(lowerdev, dev->dev_addr);
 
         macvlan_hash_del(vlan);
         return 0;
@@ -332,11 +332,11 @@ static int macvlan_set_mac_address(struct net_device *dev, void *p)
                 if (macvlan_addr_busy(vlan->port, addr->sa_data))
                         return -EBUSY;
 
-                err = dev_unicast_add(lowerdev, addr->sa_data);
+                err = dev_uc_add(lowerdev, addr->sa_data);
                 if (err)
                         return err;
 
-                dev_unicast_delete(lowerdev, dev->dev_addr);
+                dev_uc_del(lowerdev, dev->dev_addr);
 
                 macvlan_hash_change_addr(vlan, addr->sa_data);
         }
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 2f47ae7cce91..de33e38a4059 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -308,9 +308,9 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
          * for multiple unicast MACs.
          */
         memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
-        dev_unicast_add(netdev, flogi_maddr);
+        dev_uc_add(netdev, flogi_maddr);
         if (fip->spma)
-                dev_unicast_add(netdev, fip->ctl_src_addr);
+                dev_uc_add(netdev, fip->ctl_src_addr);
         dev_mc_add(netdev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0);
 
         /*
@@ -394,9 +394,9 @@ void fcoe_interface_cleanup(struct fcoe_interface *fcoe)
 
         /* Delete secondary MAC addresses */
         memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
-        dev_unicast_delete(netdev, flogi_maddr);
+        dev_uc_del(netdev, flogi_maddr);
         if (fip->spma)
-                dev_unicast_delete(netdev, fip->ctl_src_addr);
+                dev_uc_del(netdev, fip->ctl_src_addr);
         dev_mc_delete(netdev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0);
 
         /* Tell the LLD we are done w/ FCoE */
@@ -490,9 +490,9 @@ static void fcoe_update_src_mac(struct fc_lport *lport, u8 *addr)
 
         rtnl_lock();
         if (!is_zero_ether_addr(port->data_src_addr))
-                dev_unicast_delete(fcoe->netdev, port->data_src_addr);
+                dev_uc_del(fcoe->netdev, port->data_src_addr);
         if (!is_zero_ether_addr(addr))
-                dev_unicast_add(fcoe->netdev, addr);
+                dev_uc_add(fcoe->netdev, addr);
         memcpy(port->data_src_addr, addr, ETH_ALEN);
         rtnl_unlock();
 }
@@ -819,7 +819,7 @@ static void fcoe_if_destroy(struct fc_lport *lport)
 
         rtnl_lock();
         if (!is_zero_ether_addr(port->data_src_addr))
-                dev_unicast_delete(netdev, port->data_src_addr);
+                dev_uc_del(netdev, port->data_src_addr);
         rtnl_unlock();
 
         /* receives may not be stopped until after this */