From: John Soni Jose Date: Thu, 23 Aug 2012 08:51:08 +0000 (+0530) Subject: be2iscsi: Removing the iscsi_data_pdu setting. X-Git-Tag: v2.6.39-400.9.0~333^2~6 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=59e0af7eb902079232667be5e4c2db081940b92c;p=users%2Fjedix%2Flinux-maple.git be2iscsi: Removing the iscsi_data_pdu setting. The setting of iscsi_data_pdu is not required anymore, as this was required for BE1 adapters only. The BE1 adapter were not supported in any previous versions of the kernel. Patch Submitted to upstream kernel. Signed-off-by: John Soni Jose Signed-off-by: Jayamohan Kallickal --- diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index e6061d0ec4e0..8f11090f94ce 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -3980,15 +3980,6 @@ static int beiscsi_iotask(struct iscsi_task *task, struct scatterlist *sg, io_task->bhs_len = sizeof(struct be_cmd_bhs); if (writedir) { - memset(&io_task->cmd_bhs->iscsi_data_pdu, 0, 48); - AMAP_SET_BITS(struct amap_pdu_data_out, itt, - &io_task->cmd_bhs->iscsi_data_pdu, - (unsigned int)io_task->cmd_bhs->iscsi_hdr.itt); - AMAP_SET_BITS(struct amap_pdu_data_out, opcode, - &io_task->cmd_bhs->iscsi_data_pdu, - ISCSI_OPCODE_SCSI_DATA_OUT); - AMAP_SET_BITS(struct amap_pdu_data_out, final_bit, - &io_task->cmd_bhs->iscsi_data_pdu, 1); AMAP_SET_BITS(struct amap_iscsi_wrb, type, pwrb, INI_WR_CMD); AMAP_SET_BITS(struct amap_iscsi_wrb, dsp, pwrb, 1); @@ -3997,9 +3988,6 @@ static int beiscsi_iotask(struct iscsi_task *task, struct scatterlist *sg, INI_RD_CMD); AMAP_SET_BITS(struct amap_iscsi_wrb, dsp, pwrb, 0); } - memcpy(&io_task->cmd_bhs->iscsi_data_pdu. - dw[offsetof(struct amap_pdu_data_out, lun) / 32], - &io_task->cmd_bhs->iscsi_hdr.lun, sizeof(struct scsi_lun)); AMAP_SET_BITS(struct amap_iscsi_wrb, lun, pwrb, cpu_to_be16(*(unsigned short *)