Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2017-08-27 14:44:13 -07:00
2 changed files with 6 additions and 5 deletions

View File

@@ -3,9 +3,10 @@
ABT_DETAILS="x86_64"
ABT_JOBS=5
ABT_KERNELS=" \
4.11 \
4.10.13-nc \
4.9.25-nc \
4.12.9 \
4.11.12-nc \
4.10.17-nc \
4.9.45-nc \
4.8.17-nc \
4.7.10-nc \
4.6.7-nc \

View File

@@ -589,7 +589,7 @@ static void srpt_mgmt_method_get(struct srpt_port *sp, struct ib_mad *rq_mad,
static void srpt_mad_send_handler(struct ib_mad_agent *mad_agent,
struct ib_mad_send_wc *mad_wc)
{
#ifdef HAVE_RDMA_DESTROY_AH
#if HAVE_RDMA_DESTROY_AH
rdma_destroy_ah(mad_wc->send_buf->ah);
#else
ib_destroy_ah(mad_wc->send_buf->ah);
@@ -665,7 +665,7 @@ static void srpt_mad_recv_handler(struct ib_mad_agent *mad_agent,
ib_free_send_mad(rsp);
err_rsp:
#ifdef HAVE_RDMA_DESTROY_AH
#if HAVE_RDMA_DESTROY_AH
rdma_destroy_ah(ah);
#else
ib_destroy_ah(ah);