Merge r7371 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7631 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-04 03:06:00 +00:00
parent 7588fc84a9
commit 198143172d
4 changed files with 20 additions and 0 deletions
+2
View File
@@ -469,6 +469,7 @@ struct srpt_device {
struct ib_event_handler event_handler;
};
#if !HAVE_STRUCT_SRP_LOGIN_REQ_RDMA
/**
* struct srp_login_req_rdma - RDMA/CM login parameters.
*
@@ -487,5 +488,6 @@ struct srp_login_req_rdma {
u8 initiator_port_id[16];
u8 target_port_id[16];
};
#endif /* !HAVE_STRUCT_SRP_LOGIN_REQ_RDMA */
#endif /* IB_SRPT_H */