From fc8dab0c6b5846a9b5e3b2d41a1cbeca1d8d9709 Mon Sep 17 00:00:00 2001 From: Nilesh Javali Date: Sat, 29 Dec 2012 02:24:53 -0500 Subject: [PATCH] --- yaml --- r: 359470 b: refs/heads/master c: e19dd66f105c54868e722f6b0a4f2edfc83f1ef9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_nx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8f863b690463..edd259583249 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e951aca1beaf8493536cedfce4152531f7c4b59b +refs/heads/master: e19dd66f105c54868e722f6b0a4f2edfc83f1ef9 diff --git a/trunk/drivers/scsi/qla4xxx/ql4_nx.c b/trunk/drivers/scsi/qla4xxx/ql4_nx.c index 491668d439a2..b3d6dabdc6f4 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_nx.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_nx.c @@ -3427,11 +3427,11 @@ int qla4_8xxx_get_sys_info(struct scsi_qla_host *ha) } /* Make sure we receive the minimum required data to cache internally */ - if (mbox_sts[4] < offsetof(struct mbx_sys_info, reserved)) { + if ((is_qla8032(ha) ? mbox_sts[3] : mbox_sts[4]) < + offsetof(struct mbx_sys_info, reserved)) { DEBUG2(printk("scsi%ld: %s: GET_SYS_INFO data receive" " error (%x)\n", ha->host_no, __func__, mbox_sts[4])); goto exit_validate_mac82; - } /* Save M.A.C. address & serial_number */