mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-19 03:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge r5860 from the iser branch

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6265 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2015-06-11 16:32:49 +00:00
parent a9b0644c96
commit 010de6bd43
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
iscsi-scst/kernel/isert-scst/iser_hdr.h
View File

@@ -60,5 +60,13 @@ struct isert_hdr {
#define ISER_MAX_LOGIN_RDSL (ISCSI_LOGIN_MAX_RDSL + ISER_HDRS_SZ)
#define ISER_ZBVA_NOT_SUPPORTED 0x80
#define ISER_SEND_W_INV_NOT_SUPPORTED 0x40
struct isert_cm_hdr {
u8 flags;
u8 rsvd[3];
} __packed;
#endif

5
iscsi-scst/kernel/isert-scst/iser_rdma.c
View File

@@ -1234,6 +1234,7 @@ static int isert_cm_conn_req_handler(struct rdma_cm_id *cm_id,
struct isert_connection *isert_conn;
struct rdma_conn_param *ini_conn_param;
struct rdma_conn_param tgt_conn_param;
struct isert_cm_hdr cm_hdr = { 0 };
int err;
TRACE_ENTRY();
@@ -1281,6 +1282,10 @@ static int isert_cm_conn_req_handler(struct rdma_cm_id *cm_id,
if (tgt_conn_param.initiator_depth > ini_conn_param->initiator_depth)
tgt_conn_param.initiator_depth = ini_conn_param->initiator_depth;
tgt_conn_param.private_data_len = sizeof(cm_hdr);
tgt_conn_param.private_data = &cm_hdr;
cm_hdr.flags = ISER_ZBVA_NOT_SUPPORTED | ISER_SEND_W_INV_NOT_SUPPORTED;
err = rdma_accept(cm_id, &tgt_conn_param);
if (unlikely(err)) {
pr_err("Failed to accept conn request, err:%d\n", err);