On 7/1/10 10:39 AM, Joe Eykholt wrote: > On 7/1/10 10:19 AM, Vasu Dev wrote: >> This reverts commit cc0136c2e9c10e889cb36e39710c0eb10707b396. >> >> That commit introduced vlan id info to WWPN but WWPN needs to >> remain static as an unique port identifier in the fabric, therefore >> variable fabric vlan id info doesn't need to be embedded inside WWPN. >> >> After this revert, port arg to fcoe_wwn_from_mac is always zero >> but still leaving it as-is might be okay to later allow users >> to use NAA 2 scheme with this additional identifier, so limiting >> to only this revert is sufficient for now to get rid off vlan id >> in WWPN but I'm also okay to remove port arg if others wants that. > > I agree that the fcoe_wwn_from_mac() should keep the port arg for scheme 2. > > The patch looks OK but it means that only one VLAN should be used at a time > per network interface. Otherwise, they all would get the same port name. > That might work if the fabrics/VSANs are distinct, but it will confuse > management > software and IT people.
Also note that this could require a zoning change for existing users. > Perhaps its time to optionally specify the port name when creating an > interface. > > Perhaps we should check for port name uniqueness among all > the other libfc or fcoe ports before creating an lport. > > Joe > > >> Signed-off-by: Vasu Dev<[email protected]> >> --- >> >> drivers/scsi/fcoe/fcoe.c | 11 +---------- >> 1 files changed, 1 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c >> index 44a0759..16ee28c 100644 >> --- a/drivers/scsi/fcoe/fcoe.c >> +++ b/drivers/scsi/fcoe/fcoe.c >> @@ -588,7 +588,6 @@ static int fcoe_netdev_config(struct fc_lport *lport, >> struct net_device *netdev) >> u64 wwnn, wwpn; >> struct fcoe_interface *fcoe; >> struct fcoe_port *port; >> - int vid = 0; >> >> /* Setup lport private data to point to fcoe softc */ >> port = lport_priv(lport); >> @@ -635,20 +634,12 @@ static int fcoe_netdev_config(struct fc_lport *lport, >> struct net_device *netdev) >> fcoe_link_speed_update(lport); >> >> if (!lport->vport) { >> - /* >> - * Use NAA 1&2 (FC-FS Rev. 2.0, Sec. 15) to generate WWNN/WWPN: >> - * For WWNN, we use NAA 1 w/ bit 27-16 of word 0 as 0. >> - * For WWPN, we use NAA 2 w/ bit 27-16 of word 0 from VLAN ID >> - */ >> - if (netdev->priv_flags& IFF_802_1Q_VLAN) >> - vid = vlan_dev_vlan_id(netdev); >> - >> if (fcoe_get_wwn(netdev,&wwnn, NETDEV_FCOE_WWNN)) >> wwnn = fcoe_wwn_from_mac(fcoe->ctlr.ctl_src_addr, 1, 0); >> fc_set_wwnn(lport, wwnn); >> if (fcoe_get_wwn(netdev,&wwpn, NETDEV_FCOE_WWPN)) >> wwpn = fcoe_wwn_from_mac(fcoe->ctlr.ctl_src_addr, >> - 2, vid); >> + 2, 0); >> fc_set_wwpn(lport, wwpn); >> } >> >> >> _______________________________________________ >> devel mailing list >> [email protected] >> http://www.open-fcoe.org/mailman/listinfo/devel > > _______________________________________________ > devel mailing list > [email protected] > http://www.open-fcoe.org/mailman/listinfo/devel _______________________________________________ devel mailing list [email protected] http://www.open-fcoe.org/mailman/listinfo/devel
