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

ib_srpt: Build fix for the nightly build against kernel v4.2

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6507 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2015-09-16 16:43:32 +00:00
parent 0cbd279a34
commit cba8f3ab7e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
srpt/src/ib_srpt.c
View File

@@ -627,7 +627,9 @@ static void srpt_mad_recv_handler(struct ib_mad_agent *mad_agent,
#endif
0, IB_MGMT_DEVICE_HDR, IB_MGMT_DEVICE_DATA,
GFP_KERNEL
#ifdef CREATE_SEND_MAD_HAS_BASE_ARG
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) || \
defined(CREATE_SEND_MAD_HAS_BASE_ARG)
, 0
#endif
);
@@ -2181,11 +2183,12 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
if (!qp_init)
goto out;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) \
&& !defined(RHEL_RELEASE_CODE)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) && \
!defined(RHEL_RELEASE_CODE)
ch->cq = ib_create_cq(sdev->device, srpt_completion, NULL, ch,
ch->rq_size + srpt_sq_size);
#elif !defined(IB_CREATE_CQ_HAS_INIT_ATTR)
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) && \
!defined(IB_CREATE_CQ_HAS_INIT_ATTR)
ch->cq = ib_create_cq(sdev->device, srpt_completion, NULL, ch,
ch->rq_size + srpt_sq_size, ch->comp_vector);
#else