fnic: Leftshift returned scsi_cmnd error code 16 bits

From: Satish Kharat <satishkh@cisco.com>

The the scsi_cmnd error code is expected to be in the left 16 bits
of the result field. Change is to correct this.

Signed-off-by: Satish Kharat <satishkh@cisco.com>
Orabug: 22918200
Signed-off-by: Jason Luo <zhangqing.luo@oracle.com>

diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
index 35264c7bdaacd9f9ccde0c54cbb5fc4bfe96f396..e4e22f1d71215095ead7ec1169c4bc30caa30032 100644 (file)
--- a/drivers/scsi/fnic/fnic.h
+++ b/drivers/scsi/fnic/fnic.h
@@ -39,7 +39,7 @@
 
 #define DRV_NAME               "fnic"
 #define DRV_DESCRIPTION                "Cisco FCoE HBA Driver"
-#define DRV_VERSION            "1.6.0.22"
+#define DRV_VERSION            "1.6.0.24"
 #define PFX                    DRV_NAME ": "
 #define DFX                     DRV_NAME "%d: "
 

diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 87cf9ddc4bccd133e02bcfb0ebd1c7649a3c7089..1637e295e288b01ea57aa1b9273279454fa9cea4 100644 (file)
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -444,7 +444,7 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_
                        FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
                                "returning DID_NO_CONNECT for IO as rport is removed\n");
                        atomic64_inc(&fnic_stats->misc_stats.rport_not_ready);
-                       sc->result = DID_NO_CONNECT;
+                       sc->result = DID_NO_CONNECT<<16;
                        done(sc);
                        return 0;
                }