On Fri, 2011-06-24 at 15:20 -0500, Mike Christie wrote:
> On 06/23/2011 05:51 PM, Eddie Wai wrote:
> > Modified the memcpy of nopout_wqe->lun to use sizeof(struct scsi_lun)
> > instead of the hardcoded value 8 as noted by review comments.
> >
> > Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
> > ---
> > drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
> > index 2a1bb9f..ba2f96e 100644
> > --- a/drivers/scsi/bnx2i/bnx2i_hwi.c
> > +++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
> > @@ -551,7 +551,7 @@ int bnx2i_send_iscsi_nopout(struct bnx2i_conn *bnx2i_conn,
> >
> > nopout_wqe->op_code = nopout_hdr->opcode;
> > nopout_wqe->op_attr = ISCSI_FLAG_CMD_FINAL;
> > - memcpy(nopout_wqe->lun, nopout_hdr->lun, 8);
> > + memcpy(nopout_wqe->lun, nopout_hdr->lun, sizeof(struct scsi_lun));
> >
> > if (test_bit(BNX2I_NX2_DEV_57710, &ep->hba->cnic_dev_type)) {
> > u32 tmp = nopout_wqe->lun[0];
>
> This patch and Andy your patch "[PATCH] iscsi: Use struct scsi_lun in
> iscsi structs instead of u8[8]" are going to conflict with each other.
>
> And Eddie, I think you missed some other instances where 8 is hardcoded.
Agreed, I skipped this one for now ... please resubmit against scsi-misc
if more work is needed.
Thanks,
James
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
