diff options
author | James Smart <jsmart2021@gmail.com> | 2017-02-12 16:52:36 -0500 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-02-22 18:41:43 -0500 |
commit | 8c258641e01cfcc5620c4fb191300bea224bcc99 (patch) | |
tree | 624fe23d85243c2c8c891fed355901a1c5a532cd /drivers/scsi/lpfc/lpfc_ct.c | |
parent | 2d7dbc4c2775eb30df97be00090adbfcc7fc5086 (diff) |
scsi: lpfc: NVME Target: Merge into FC discovery
NVME Target: Merge into FC discovery
Adds NVME PRLI handling and Nameserver registrations for NVME
Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_ct.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_ct.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c index 2c051369857a..d576da4d3afb 100644 --- a/drivers/scsi/lpfc/lpfc_ct.c +++ b/drivers/scsi/lpfc/lpfc_ct.c | |||
@@ -1433,7 +1433,13 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, | |||
1433 | if (((phba->cfg_enable_fc4_type == LPFC_ENABLE_BOTH) || | 1433 | if (((phba->cfg_enable_fc4_type == LPFC_ENABLE_BOTH) || |
1434 | (phba->cfg_enable_fc4_type == LPFC_ENABLE_NVME)) && | 1434 | (phba->cfg_enable_fc4_type == LPFC_ENABLE_NVME)) && |
1435 | (context == FC_TYPE_NVME)) { | 1435 | (context == FC_TYPE_NVME)) { |
1436 | lpfc_nvme_update_localport(vport); | 1436 | if ((vport == phba->pport) && phba->nvmet_support) { |
1437 | CtReq->un.rff.fbits = (FC4_FEATURE_TARGET | | ||
1438 | FC4_FEATURE_NVME_DISC); | ||
1439 | /* todo: update targetport attributes */ | ||
1440 | } else { | ||
1441 | lpfc_nvme_update_localport(vport); | ||
1442 | } | ||
1437 | CtReq->un.rff.type_code = context; | 1443 | CtReq->un.rff.type_code = context; |
1438 | 1444 | ||
1439 | } else if (((phba->cfg_enable_fc4_type == LPFC_ENABLE_BOTH) || | 1445 | } else if (((phba->cfg_enable_fc4_type == LPFC_ENABLE_BOTH) || |