[SCSI] libfcoe: Don't fill MAC desc in FLOGI if FIP negotiated FPMA

FPMA indicates that the Fabric will provide the host's
N_Port's MAC address. When sending a FLOGI/FDISC frame
and FPMA was negotiated through FIP discovery we still
need to provide the MAC descriptor, as per the
specification, but the MAC should be zero'd out since
the FCF will be providing it in the FLOGI/FDISC ACC.

In FC-BB-5 section 7.8.7.4.2 (Fabric login) it states:

The MAC address field in the MAC address descriptor of a FIP FLOGI
Request operation or a FIP NPIV FDISC Request operation shall contain:
a) the proposed MAC address to use as VN_Port MAC address if the ENode
   is requesting to use SPMA (see table 27);
b) all zeroes to indicate no MAC address is proposed if the ENode is
   requesting to use FPMA (see table 27); or
c) the proposed MAC address to use as VN_Port MAC address if the ENode
   supports both SPMA and FPMA and leaves the decision of which
   addressing scheme to use to the FCF (i.e., if both the FP and SP
   bits are set to one, see table 27).

This patch fixes case B.

This patch also adds debug statements to illustrate
whether a FPMA or SPMA MAC is added to a FLOGI/FDISC
frame.

Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: Chris Leech <christopher.leech@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
index ff5ccba3d7419cb51071cc6cf16d8206e37c0978..de5c329cb3b49727efb28b00749c1380a80074ce 100644 (file)
--- a/drivers/scsi/fcoe/libfcoe.c
+++ b/drivers/scsi/fcoe/libfcoe.c
@@ -442,10 +442,15 @@ static int fcoe_ctlr_encaps(struct fcoe_ctlr *fip, struct fc_lport *lport,
        memset(mac, 0, sizeof(mac));
        mac->fd_desc.fip_dtype = FIP_DT_MAC;
        mac->fd_desc.fip_dlen = sizeof(*mac) / FIP_BPW;
-       if (dtype != FIP_DT_FLOGI && dtype != FIP_DT_FDISC)
+       if (dtype != FIP_DT_FLOGI && dtype != FIP_DT_FDISC) {
                memcpy(mac->fd_mac, fip->get_src_addr(lport), ETH_ALEN);
-       else if (fip->spma)
+       } else if (fip_flags & FIP_FL_SPMA) {
+               LIBFCOE_FIP_DBG(fip, "FLOGI/FDISC sent with SPMA\n");
                memcpy(mac->fd_mac, fip->ctl_src_addr, ETH_ALEN);
+       } else {
+               LIBFCOE_FIP_DBG(fip, "FLOGI/FDISC sent with FPMA\n");
+               /* FPMA only FLOGI must leave the MAC desc set to all 0s */
+       }
 
        skb->protocol = htons(ETH_P_FIP);
        skb_reset_mac_header(skb);