Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afd96fa4 authored by John Soni Jose's avatar John Soni Jose Committed by James Bottomley
Browse files

[SCSI] 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.

Signed-off-by: default avatarJohn Soni Jose <sony.john-n@emulex.com>
Signed-off-by: default avatarJayamohan Kallickal <jayamohan.kallickal@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent c66c013f

drivers/scsi/be2iscsi/be_main.c

+0 −12
Original line number Diff line number Diff line
@@ -3981,15 +3981,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);
@@ -3998,9 +3989,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 *)