xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wr-cleanup' of git://git.infradead.org/users/hch/rdma into wr-cleanup

Browse Source 
Signed-off-by: Doug Ledford <dledford@redhat.com>

Conflicts:
	drivers/infiniband/ulp/isert/ib_isert.c - Commit 4366b19ca5
	(iser-target: Change the recv buffers posting logic) changed the
	logic in isert_put_datain() and had to be hand merged
This commit is contained in:
Doug Ledford
2015-10-28 22:21:09 -04:00
parent 9ffecb1028 25556ae6b9
commit eb14ab3ba1
98 changed files with 1693 additions and 1242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/infiniband/ulp/isert/ib_isert.h
View File

@@ -117,9 +117,9 @@ struct isert_rdma_wr {
enum iser_ib_op_code iser_ib_op;
struct ib_sge *ib_sge;
struct ib_sge s_ib_sge;
int send_wr_num;
struct ib_send_wr *send_wr;
struct ib_send_wr s_send_wr;
int rdma_wr_num;
struct ib_rdma_wr *rdma_wr;
struct ib_rdma_wr s_rdma_wr;
struct ib_sge ib_sg[3];
struct isert_data_buf data;
struct isert_data_buf prot;