diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2017-12-28 05:50:46 +0100 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2017-12-28 05:50:46 +0100 |
| commit | 76a895d9e1332ca3cfa3edff3dc04420dfd7d603 (patch) | |
| tree | aa6a436505a6c495a8243165a336d3bd56f69f12 /drivers/infiniband/core/verbs.c | |
| parent | infiniband: drop unknown function from core_priv.h (diff) | |
| parent | RDMA/vmw_pvrdma: Remove usage of BIT() from UAPI header (diff) | |
| download | linux-76a895d9e1332ca3cfa3edff3dc04420dfd7d603.tar.xz linux-76a895d9e1332ca3cfa3edff3dc04420dfd7d603.zip | |
Merge branch 'from-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
Patches for 4.16 that are dependent on patches sent to 4.15-rc.
These are small clean ups for the vmw_pvrdma and i40iw drivers.
* 'from-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git:
RDMA/vmw_pvrdma: Remove usage of BIT() from UAPI header
RDMA/vmw_pvrdma: Use refcount_t instead of atomic_t
RDMA/vmw_pvrdma: Use more specific sizeof in kcalloc
RDMA/vmw_pvrdma: Clarify QP and CQ is_kernel logic
RDMA/vmw_pvrdma: Add UAR SRQ macros in ABI header file
i40iw: Change accelerated flag to bool
Diffstat (limited to 'drivers/infiniband/core/verbs.c')
| -rw-r--r-- | drivers/infiniband/core/verbs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index b53fb0e98751..fe72fb303b01 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c @@ -1439,7 +1439,8 @@ int ib_close_qp(struct ib_qp *qp) spin_unlock_irqrestore(&real_qp->device->event_handler_lock, flags); atomic_dec(&real_qp->usecnt); - ib_close_shared_qp_security(qp->qp_sec); + if (qp->qp_sec) + ib_close_shared_qp_security(qp->qp_sec); kfree(qp); return 0; |