[SCSI] qla2xxx: Select link initialization option bits from current operating mode.

Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 126188468f8b0db9227fb6de121833995a7c8a04..c825d1d2ba4007bbf1c47d0b503589147f75d89f 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -1667,7 +1667,11 @@ qla24xx_link_initialize(scsi_qla_host_t *vha)
                return QLA_FUNCTION_FAILED;
 
        mcp->mb[0] = MBC_LINK_INITIALIZATION;
-       mcp->mb[1] = BIT_6|BIT_4;
+       mcp->mb[1] = BIT_4;
+       if (vha->hw->operating_mode == LOOP)
+               mcp->mb[1] |= BIT_6;
+       else
+               mcp->mb[1] |= BIT_5;
        mcp->mb[2] = 0;
        mcp->mb[3] = 0;
        mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;