git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[safe/jmp/linux-2.6]
/
drivers
/
scsi
/
fcoe
/
fcoe.c
diff --git
a/drivers/scsi/fcoe/fcoe.c
b/drivers/scsi/fcoe/fcoe.c
index
ba75a98
..
9276121
100644
(file)
--- a/
drivers/scsi/fcoe/fcoe.c
+++ b/
drivers/scsi/fcoe/fcoe.c
@@
-312,10
+312,10
@@
static int fcoe_interface_setup(struct fcoe_interface *fcoe,
* for multiple unicast MACs.
*/
memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
* for multiple unicast MACs.
*/
memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
- dev_u
nicast
_add(netdev, flogi_maddr);
+ dev_u
c
_add(netdev, flogi_maddr);
if (fip->spma)
if (fip->spma)
- dev_u
nicast
_add(netdev, fip->ctl_src_addr);
- dev_mc_add(netdev, FIP_ALL_ENODE_MACS
, ETH_ALEN, 0
);
+ dev_u
c
_add(netdev, fip->ctl_src_addr);
+ dev_mc_add(netdev, FIP_ALL_ENODE_MACS);
/*
* setup the receive function from ethernet driver
/*
* setup the receive function from ethernet driver
@@
-398,10
+398,10
@@
void fcoe_interface_cleanup(struct fcoe_interface *fcoe)
/* Delete secondary MAC addresses */
memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
/* Delete secondary MAC addresses */
memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
- dev_u
nicast_delete
(netdev, flogi_maddr);
+ dev_u
c_del
(netdev, flogi_maddr);
if (fip->spma)
if (fip->spma)
- dev_u
nicast_delete
(netdev, fip->ctl_src_addr);
- dev_mc_del
ete(netdev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0
);
+ dev_u
c_del
(netdev, fip->ctl_src_addr);
+ dev_mc_del
(netdev, FIP_ALL_ENODE_MACS
);
/* Tell the LLD we are done w/ FCoE */
ops = netdev->netdev_ops;
/* Tell the LLD we are done w/ FCoE */
ops = netdev->netdev_ops;
@@
-494,9
+494,9
@@
static void fcoe_update_src_mac(struct fc_lport *lport, u8 *addr)
rtnl_lock();
if (!is_zero_ether_addr(port->data_src_addr))
rtnl_lock();
if (!is_zero_ether_addr(port->data_src_addr))
- dev_u
nicast_delete
(fcoe->netdev, port->data_src_addr);
+ dev_u
c_del
(fcoe->netdev, port->data_src_addr);
if (!is_zero_ether_addr(addr))
if (!is_zero_ether_addr(addr))
- dev_u
nicast
_add(fcoe->netdev, addr);
+ dev_u
c
_add(fcoe->netdev, addr);
memcpy(port->data_src_addr, addr, ETH_ALEN);
rtnl_unlock();
}
memcpy(port->data_src_addr, addr, ETH_ALEN);
rtnl_unlock();
}
@@
-830,7
+830,7
@@
static void fcoe_if_destroy(struct fc_lport *lport)
fcoe_clean_pending_queue(lport);
if (!is_zero_ether_addr(port->data_src_addr))
fcoe_clean_pending_queue(lport);
if (!is_zero_ether_addr(port->data_src_addr))
- dev_u
nicast_delete
(netdev, port->data_src_addr);
+ dev_u
c_del
(netdev, port->data_src_addr);
rtnl_unlock();
/* receives may not be stopped until after this */
rtnl_unlock();
/* receives may not be stopped until after this */