aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-04-01 17:22:09 -0400
committerDavid S. Miller <davem@davemloft.net>2010-04-03 17:22:11 -0400
commita748ee2426817a95b1f03012d8f339c45c722ae1 (patch)
tree37cb9f8836f05bd49b86eb52ddeff3e98185cc58 /drivers
parent9fc4178b149ae8b0a2fbf83f2f4df3cf8789177b (diff)
net: move address list functions to a separate file
+little renaming of unicast functions to be smooth with multicast ones Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/bonding/bond_main.c2
-rw-r--r--drivers/net/macvlan.c10
-rw-r--r--drivers/scsi/fcoe/fcoe.c14
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)
1491 } 1491 }
1492 1492
1493 /* Flush unicast and multicast addresses */ 1493 /* Flush unicast and multicast addresses */
1494 dev_unicast_flush(bond_dev); 1494 dev_uc_flush(bond_dev);
1495 dev_addr_discard(bond_dev); 1495 dev_addr_discard(bond_dev);
1496 1496
1497 if (slave_dev->type != ARPHRD_ETHER) 1497 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)
282 if (macvlan_addr_busy(vlan->port, dev->dev_addr)) 282 if (macvlan_addr_busy(vlan->port, dev->dev_addr))
283 goto out; 283 goto out;
284 284
285 err = dev_unicast_add(lowerdev, dev->dev_addr); 285 err = dev_uc_add(lowerdev, dev->dev_addr);
286 if (err < 0) 286 if (err < 0)
287 goto out; 287 goto out;
288 if (dev->flags & IFF_ALLMULTI) { 288 if (dev->flags & IFF_ALLMULTI) {
@@ -294,7 +294,7 @@ static int macvlan_open(struct net_device *dev)
294 return 0; 294 return 0;
295 295
296del_unicast: 296del_unicast:
297 dev_unicast_delete(lowerdev, dev->dev_addr); 297 dev_uc_del(lowerdev, dev->dev_addr);
298out: 298out:
299 return err; 299 return err;
300} 300}
@@ -308,7 +308,7 @@ static int macvlan_stop(struct net_device *dev)
308 if (dev->flags & IFF_ALLMULTI) 308 if (dev->flags & IFF_ALLMULTI)
309 dev_set_allmulti(lowerdev, -1); 309 dev_set_allmulti(lowerdev, -1);
310 310
311 dev_unicast_delete(lowerdev, dev->dev_addr); 311 dev_uc_del(lowerdev, dev->dev_addr);
312 312
313 macvlan_hash_del(vlan); 313 macvlan_hash_del(vlan);
314 return 0; 314 return 0;
@@ -332,11 +332,11 @@ static int macvlan_set_mac_address(struct net_device *dev, void *p)
332 if (macvlan_addr_busy(vlan->port, addr->sa_data)) 332 if (macvlan_addr_busy(vlan->port, addr->sa_data))
333 return -EBUSY; 333 return -EBUSY;
334 334
335 err = dev_unicast_add(lowerdev, addr->sa_data); 335 err = dev_uc_add(lowerdev, addr->sa_data);
336 if (err) 336 if (err)
337 return err; 337 return err;
338 338
339 dev_unicast_delete(lowerdev, dev->dev_addr); 339 dev_uc_del(lowerdev, dev->dev_addr);
340 340
341 macvlan_hash_change_addr(vlan, addr->sa_data); 341 macvlan_hash_change_addr(vlan, addr->sa_data);
342 } 342 }
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,
308 * for multiple unicast MACs. 308 * for multiple unicast MACs.
309 */ 309 */
310 memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN); 310 memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
311 dev_unicast_add(netdev, flogi_maddr); 311 dev_uc_add(netdev, flogi_maddr);
312 if (fip->spma) 312 if (fip->spma)
313 dev_unicast_add(netdev, fip->ctl_src_addr); 313 dev_uc_add(netdev, fip->ctl_src_addr);
314 dev_mc_add(netdev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0); 314 dev_mc_add(netdev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0);
315 315
316 /* 316 /*
@@ -394,9 +394,9 @@ void fcoe_interface_cleanup(struct fcoe_interface *fcoe)
394 394
395 /* Delete secondary MAC addresses */ 395 /* Delete secondary MAC addresses */
396 memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN); 396 memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
397 dev_unicast_delete(netdev, flogi_maddr); 397 dev_uc_del(netdev, flogi_maddr);
398 if (fip->spma) 398 if (fip->spma)
399 dev_unicast_delete(netdev, fip->ctl_src_addr); 399 dev_uc_del(netdev, fip->ctl_src_addr);
400 dev_mc_delete(netdev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0); 400 dev_mc_delete(netdev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0);
401 401
402 /* Tell the LLD we are done w/ FCoE */ 402 /* Tell the LLD we are done w/ FCoE */
@@ -490,9 +490,9 @@ static void fcoe_update_src_mac(struct fc_lport *lport, u8 *addr)
490 490
491 rtnl_lock(); 491 rtnl_lock();
492 if (!is_zero_ether_addr(port->data_src_addr)) 492 if (!is_zero_ether_addr(port->data_src_addr))
493 dev_unicast_delete(fcoe->netdev, port->data_src_addr); 493 dev_uc_del(fcoe->netdev, port->data_src_addr);
494 if (!is_zero_ether_addr(addr)) 494 if (!is_zero_ether_addr(addr))
495 dev_unicast_add(fcoe->netdev, addr); 495 dev_uc_add(fcoe->netdev, addr);
496 memcpy(port->data_src_addr, addr, ETH_ALEN); 496 memcpy(port->data_src_addr, addr, ETH_ALEN);
497 rtnl_unlock(); 497 rtnl_unlock();
498} 498}
@@ -819,7 +819,7 @@ static void fcoe_if_destroy(struct fc_lport *lport)
819 819
820 rtnl_lock(); 820 rtnl_lock();
821 if (!is_zero_ether_addr(port->data_src_addr)) 821 if (!is_zero_ether_addr(port->data_src_addr))
822 dev_unicast_delete(netdev, port->data_src_addr); 822 dev_uc_del(netdev, port->data_src_addr);
823 rtnl_unlock(); 823 rtnl_unlock();
824 824
825 /* receives may not be stopped until after this */ 825 /* receives may not be stopped until after this */