From c623b4a61fde880b5a5f5c0f2d2bc0f2db4f96a8 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 26 Sep 2011 09:23:37 +0300 Subject: [PATCH] --- yaml --- r: 282249 b: refs/heads/master c: 4053a4be525d3441cad6cd1ae207177f03eb9ce7 h: refs/heads/master i: 282247: 29b7c04f98cc1bfd9db1529c9de41d85271146d1 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/be2iscsi/be_main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 62d22adee164..306c87193634 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7af0abbc2ffcae601ea14e39048901833528f104 +refs/heads/master: 4053a4be525d3441cad6cd1ae207177f03eb9ce7 diff --git a/trunk/drivers/scsi/be2iscsi/be_main.c b/trunk/drivers/scsi/be2iscsi/be_main.c index 379c696dac19..fc7c97d7e34d 100644 --- a/trunk/drivers/scsi/be2iscsi/be_main.c +++ b/trunk/drivers/scsi/be2iscsi/be_main.c @@ -1105,7 +1105,6 @@ be_complete_io(struct beiscsi_conn *beiscsi_conn, struct be_status_bhs *sts_bhs = (struct be_status_bhs *)io_task->cmd_bhs; struct iscsi_conn *conn = beiscsi_conn->conn; - unsigned int sense_len; unsigned char *sense; u32 resid = 0, exp_cmdsn, max_cmdsn; u8 rsp, status, flags; @@ -1153,9 +1152,11 @@ be_complete_io(struct beiscsi_conn *beiscsi_conn, } if (status == SAM_STAT_CHECK_CONDITION) { + u16 sense_len; unsigned short *slen = (unsigned short *)sts_bhs->sense_info; + sense = sts_bhs->sense_info + sizeof(unsigned short); - sense_len = cpu_to_be16(*slen); + sense_len = be16_to_cpu(*slen); memcpy(task->sc->sense_buffer, sense, min_t(u16, sense_len, SCSI_SENSE_BUFFERSIZE)); }