aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYi Zou <yi.zou@intel.com>2009-11-03 11:49:49 -0800
committerJames Bottomley <James.Bottomley@suse.de>2009-12-04 12:01:23 -0600
commit75ea89ef63d9ca37f190aebb7da061070005ac6e (patch)
tree83f9e6ffc8f465aec8653ef16fe94ee5eb31ea3d
parent5bab87e6d465d54a2b5899e0f583d42f00dbee2e (diff)
[SCSI] fcoe: Fix setting lport's WWNN/WWPN to use san mac address
We are still using netdev->dev_addr to generate lport's WWNN/WWPN even if the LLD has support for NETDEV_HW_ADDR_T_SAN. Instead, we should just use the fip->ctl_src_addr, which is the NETDEV_HW_ADDR_T_SAN if LLD supports it or it is just the netdev->dev_addr if it does not. Signed-off-by: Yi Zou <yi.zou@intel.com> Signed-off-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-rw-r--r--drivers/scsi/fcoe/fcoe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index c1fd7561f0b..fba7ba00c71 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -599,10 +599,10 @@ static int fcoe_netdev_config(struct fc_lport *lport, struct net_device *netdev)
setup_timer(&port->timer, fcoe_queue_timer, (unsigned long)lport);
if (!lport->vport) {
- wwnn = fcoe_wwn_from_mac(netdev->dev_addr, 1, 0);
+ wwnn = fcoe_wwn_from_mac(fcoe->ctlr.ctl_src_addr, 1, 0);
fc_set_wwnn(lport, wwnn);
/* XXX - 3rd arg needs to be vlan id */
- wwpn = fcoe_wwn_from_mac(netdev->dev_addr, 2, 0);
+ wwpn = fcoe_wwn_from_mac(fcoe->ctlr.ctl_src_addr, 2, 0);
fc_set_wwpn(lport, wwpn);
}