From e35fa1b6273b0264e4906f3b95ac99fee7b5a7cf Mon Sep 17 00:00:00 2001 From: Yi Zou Date: Tue, 3 Nov 2009 11:49:49 -0800 Subject: [PATCH] --- yaml --- r: 173685 b: refs/heads/master c: 75ea89ef63d9ca37f190aebb7da061070005ac6e h: refs/heads/master i: 173683: 842c39353594bde6cda58bf7c8e2f307cd02063e v: v3 --- [refs] | 2 +- trunk/drivers/scsi/fcoe/fcoe.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9a32cfcf8fba..78401d9f2d5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bab87e6d465d54a2b5899e0f583d42f00dbee2e +refs/heads/master: 75ea89ef63d9ca37f190aebb7da061070005ac6e diff --git a/trunk/drivers/scsi/fcoe/fcoe.c b/trunk/drivers/scsi/fcoe/fcoe.c index c1fd7561f0bd..fba7ba00c71b 100644 --- a/trunk/drivers/scsi/fcoe/fcoe.c +++ b/trunk/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); }