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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2018-02-13 18:31:03 -08:00
parent 31b5d8ee79 fa153f9b96
commit 73f84f5755
4 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
srpt/Makefile
View File

@@ -246,6 +246,12 @@ conftest/register_mad_agent/result-$(KVER).txt: \
echo "$(call run_conftest,register_mad_agent, \
-DREGISTER_MAD_AGENT_HAS_FLAGS_ARG)" >"$@"
conftest/srp_login_req_rdma/result-$(KVER).txt: \
conftest/srp_login_req_rdma/srp_login_req_rdma.c \
conftest/srp_login_req_rdma/Makefile
echo "$(call run_conftest_bool,srp_login_req_rdma, \
HAVE_STRUCT_SRP_LOGIN_REQ_RDMA)" >"$@"
conftest/use_pre_440_wr_structure/result-$(KVER).txt: \
conftest/use_pre_440_wr_structure/use_pre_440_wr_structure.c \
conftest/use_pre_440_wr_structure/Makefile

3
srpt/conftest/srp_login_req_rdma/Makefile Normal file
View File

@@ -0,0 +1,3 @@
LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
obj-m += srp_login_req_rdma.o

9
srpt/conftest/srp_login_req_rdma/srp_login_req_rdma.c Normal file
View File

@@ -0,0 +1,9 @@
#include <linux/module.h>
#include <scsi/srp.h>
static int modinit(void)
{
return sizeof(struct srp_login_req_rdma);
}
module_init(modinit);

2
srpt/src/ib_srpt.h
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 */