From: Eddie Wai Date: Wed, 16 Feb 2011 21:04:26 +0000 (-0600) Subject: [SCSI] bnx2i: Fixed the 32-bit swapping of the LUN field for nopouts for 5771X X-Git-Tag: upstream/snapshot3+hdmi~11187^2~74 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee15bd2da6a7c671e1b0095a3f128be9366b4db9;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git [SCSI] bnx2i: Fixed the 32-bit swapping of the LUN field for nopouts for 5771X Fixed a bug where the 64-bit LUN field for nopouts were 32-bit swapped. This only pertains to 5771X devices. Signed-off-by: Eddie Wai Signed-off-by: Mike Christie Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c index 603db9d..c8eff57 100644 --- a/drivers/scsi/bnx2i/bnx2i_hwi.c +++ b/drivers/scsi/bnx2i/bnx2i_hwi.c @@ -498,10 +498,10 @@ int bnx2i_send_iscsi_nopout(struct bnx2i_conn *bnx2i_conn, memcpy(nopout_wqe->lun, nopout_hdr->lun, 8); if (test_bit(BNX2I_NX2_DEV_57710, &ep->hba->cnic_dev_type)) { - u32 tmp = nopout_hdr->lun[0]; + u32 tmp = nopout_wqe->lun[0]; /* 57710 requires LUN field to be swapped */ - nopout_hdr->lun[0] = nopout_hdr->lun[1]; - nopout_hdr->lun[1] = tmp; + nopout_wqe->lun[0] = nopout_wqe->lun[1]; + nopout_wqe->lun[1] = tmp; } nopout_wqe->itt = ((u16)task->itt |