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

Commit 80b43de8 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'ipoib' and 'iser' into for-next

parents 22cfb0bf 200ae1a0

drivers/infiniband/ulp/iser/iscsi_iser.c

+7 −3
Original line number Diff line number Diff line
@@ -101,13 +101,17 @@ iscsi_iser_recv(struct iscsi_conn *conn, 


	/* verify PDU length */

	datalen = ntoh24(hdr->dlength);

	if (datalen != rx_data_len) {

		printk(KERN_ERR "iscsi_iser: datalen %d (hdr) != %d (IB) \n",

	if (datalen > rx_data_len || (datalen + 4) < rx_data_len) {

		iser_err("wrong datalen %d (hdr), %d (IB)\n",

			datalen, rx_data_len);

		rc = ISCSI_ERR_DATALEN;

		goto error;

	}



	if (datalen != rx_data_len)

		iser_dbg("aligned datalen (%d) hdr, %d (IB)\n",

			datalen, rx_data_len);



	/* read AHS */

	ahslen = hdr->hlength * 4;

drivers/infiniband/ulp/iser/iscsi_iser.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
	} while (0)



#define SHIFT_4K	12

#define SIZE_4K	(1UL << SHIFT_4K)

#define SIZE_4K	(1ULL << SHIFT_4K)

#define MASK_4K	(~(SIZE_4K-1))



					/* support up to 512KB in one RDMA */

drivers/infiniband/ulp/iser/iser_initiator.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ int iser_send_control(struct iscsi_conn *conn, 
		memcpy(iser_conn->ib_conn->login_buf, task->data,

							task->data_count);

		tx_dsg->addr    = iser_conn->ib_conn->login_dma;

		tx_dsg->length  = data_seg_len;

		tx_dsg->length  = task->data_count;

		tx_dsg->lkey    = device->mr->lkey;

		mdesc->num_sge = 2;

	}