diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2020-09-17 15:12:22 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2020-09-18 10:31:45 -0300 |
| commit | 5dee5872f87552cfb173c899d35fc1413c2aa77f (patch) | |
| tree | 273a8551247785dbec22d1e7c55e2b636e1c9e8e /drivers/infiniband/sw/rxe/rxe_mr.c | |
| parent | RDMA: Convert RWQ table logic to ib_core allocation scheme (diff) | |
| parent | RDMA: Fix link active_speed size (diff) | |
| download | linux-dev-5dee5872f87552cfb173c899d35fc1413c2aa77f.tar.xz linux-dev-5dee5872f87552cfb173c899d35fc1413c2aa77f.zip | |
Merge branch 'mlx5_active_speed' into rdma.git for-next
Leon Romanovsky says:
====================
IBTA declares speed as 16 bits, but kernel stores it in u8. This series
fixes in-kernel declaration while keeping external interface intact.
====================
Based on the mlx5-next branch at
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
due to dependencies.
* branch 'mlx5_active_speed':
RDMA: Fix link active_speed size
RDMA/mlx5: Delete duplicated mlx5_ptys_width enum
net/mlx5: Refactor query port speed functions
Diffstat (limited to 'drivers/infiniband/sw/rxe/rxe_mr.c')
| -rw-r--r-- | drivers/infiniband/sw/rxe/rxe_mr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c index 708e2dff5eaa..47f737736961 100644 --- a/drivers/infiniband/sw/rxe/rxe_mr.c +++ b/drivers/infiniband/sw/rxe/rxe_mr.c @@ -178,6 +178,7 @@ int rxe_mem_init_user(struct rxe_pd *pd, u64 start, vaddr = page_address(sg_page_iter_page(&sg_iter)); if (!vaddr) { pr_warn("null vaddr\n"); + ib_umem_release(umem); err = -ENOMEM; goto err1; } |