scsi: qla2xxx: Use known NPort ID for Management Server login

Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index a7b810213aac71840c76a2de9cf748965cecbf6c..bf50b4fbe64866c669a4ace803a00a66be126b03 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -246,8 +246,8 @@
  * There is no correspondence between an N-PORT id and an AL_PA.  Therefore the
  * valid range of an N-PORT id is 0 through 0x7ef.
  */
-#define NPH_LAST_HANDLE                0x7ef
-#define NPH_MGMT_SERVER                0x7fa           /*  FFFFFA */
+#define NPH_LAST_HANDLE                0x7ee
+#define NPH_MGMT_SERVER                0x7ef           /*  FFFFEF */
 #define NPH_SNS                        0x7fc           /*  FFFFFC */
 #define NPH_FABRIC_CONTROLLER  0x7fd           /*  FFFFFD */
 #define NPH_F_PORT             0x7fe           /*  FFFFFE */

diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 966ff0f1bed4a504442a96f8dbd78e34849ba4e6..2570146beae475cd778d6fb11301ef6bcc71ac80 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -477,7 +477,7 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
                    "Couldn't allocate vp_id.\n");
                goto create_vhost_failed;
        }
-       vha->mgmt_svr_loop_id = 10 + vha->vp_idx;
+       vha->mgmt_svr_loop_id = NPH_MGMT_SERVER;
 
        vha->dpc_flags = 0L;
 

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 38d6d12571f7a95218f2b5e73696d01426a1594c..4c3527f54b74a4945e6a2ddfd871e2df220be911 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3047,7 +3047,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
        host = base_vha->host;
        base_vha->req = req;
        if (IS_QLA2XXX_MIDTYPE(ha))
-               base_vha->mgmt_svr_loop_id = 10 + base_vha->vp_idx;
+               base_vha->mgmt_svr_loop_id = NPH_MGMT_SERVER;
        else
                base_vha->mgmt_svr_loop_id = MANAGEMENT_SERVER +
                                                base_vha->vp_idx;