[SCSI] fcoe: Fix setting lport's WWNN/WWPN to use san mac address (75ea89ef) · Commits · 戴 / test

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>

drivers/scsi/fcoe/fcoe.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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);		setup_timer(&port->timer, fcoe_queue_timer, (unsigned long)lport);

	if (!lport->vport) {		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);		fc_set_wwnn(lport, wwnn);
	/* XXX - 3rd arg needs to be vlan id */		/* 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);		fc_set_wwpn(lport, wwpn);
	}		}

Admin message