aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/fcoe
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/fcoe')
-rw-r--r--drivers/scsi/fcoe/fcoe.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index f01b9b44e8aa..54c870b8c328 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -309,10 +309,10 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
309 * for multiple unicast MACs. 309 * for multiple unicast MACs.
310 */ 310 */
311 memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN); 311 memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
312 dev_unicast_add(netdev, flogi_maddr); 312 dev_uc_add(netdev, flogi_maddr);
313 if (fip->spma) 313 if (fip->spma)
314 dev_unicast_add(netdev, fip->ctl_src_addr); 314 dev_uc_add(netdev, fip->ctl_src_addr);
315 dev_mc_add(netdev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0); 315 dev_mc_add(netdev, FIP_ALL_ENODE_MACS);
316 316
317 /* 317 /*
318 * setup the receive function from ethernet driver 318 * setup the receive function from ethernet driver
@@ -395,10 +395,10 @@ void fcoe_interface_cleanup(struct fcoe_interface *fcoe)
395 395
396 /* Delete secondary MAC addresses */ 396 /* Delete secondary MAC addresses */
397 memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN); 397 memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
398 dev_unicast_delete(netdev, flogi_maddr); 398 dev_uc_del(netdev, flogi_maddr);
399 if (fip->spma) 399 if (fip->spma)
400 dev_unicast_delete(netdev, fip->ctl_src_addr); 400 dev_uc_del(netdev, fip->ctl_src_addr);
401 dev_mc_delete(netdev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0); 401 dev_mc_del(netdev, FIP_ALL_ENODE_MACS);
402 402
403 /* Tell the LLD we are done w/ FCoE */ 403 /* Tell the LLD we are done w/ FCoE */
404 ops = netdev->netdev_ops; 404 ops = netdev->netdev_ops;
@@ -491,9 +491,9 @@ static void fcoe_update_src_mac(struct fc_lport *lport, u8 *addr)
491 491
492 rtnl_lock(); 492 rtnl_lock();
493 if (!is_zero_ether_addr(port->data_src_addr)) 493 if (!is_zero_ether_addr(port->data_src_addr))
494 dev_unicast_delete(fcoe->netdev, port->data_src_addr); 494 dev_uc_del(fcoe->netdev, port->data_src_addr);
495 if (!is_zero_ether_addr(addr)) 495 if (!is_zero_ether_addr(addr))
496 dev_unicast_add(fcoe->netdev, addr); 496 dev_uc_add(fcoe->netdev, addr);
497 memcpy(port->data_src_addr, addr, ETH_ALEN); 497 memcpy(port->data_src_addr, addr, ETH_ALEN);
498 rtnl_unlock(); 498 rtnl_unlock();
499} 499}
@@ -820,7 +820,7 @@ static void fcoe_if_destroy(struct fc_lport *lport)
820 820
821 rtnl_lock(); 821 rtnl_lock();
822 if (!is_zero_ether_addr(port->data_src_addr)) 822 if (!is_zero_ether_addr(port->data_src_addr))
823 dev_unicast_delete(netdev, port->data_src_addr); 823 dev_uc_del(netdev, port->data_src_addr);
824 rtnl_unlock(); 824 rtnl_unlock();
825 825
826 /* receives may not be stopped until after this */ 826 /* receives may not be stopped until after this */