diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-04-01 17:22:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-03 17:22:11 -0400 |
commit | a748ee2426817a95b1f03012d8f339c45c722ae1 (patch) | |
tree | 37cb9f8836f05bd49b86eb52ddeff3e98185cc58 /drivers/scsi/fcoe/fcoe.c | |
parent | 9fc4178b149ae8b0a2fbf83f2f4df3cf8789177b (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/scsi/fcoe/fcoe.c')
-rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 14 |
1 files changed, 7 insertions, 7 deletions
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 */ |