diff options
| author |   Jason Gunthorpe <jgg@mellanox.com> | 2018-08-16 13:08:18 -0600 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2018-08-16 13:12:00 -0600 |
| commit | 89982f7ccee2fcd8fea7936b81eec6defbf0f131 (patch) | |
| tree | fc553c8d008d24595ad7de0ea0f3b56f656da27c /net/rds/ib_frmr.c | |
| parent | RDMA/hns: Fix usage of bitmap allocation functions return values (diff) | |
| parent | Linux 4.18 (diff) | |
| download | linux-dev-89982f7ccee2fcd8fea7936b81eec6defbf0f131.tar.xz linux-dev-89982f7ccee2fcd8fea7936b81eec6defbf0f131.zip | |
Merge tag 'v4.18' into rdma.git for-next
Resolve merge conflicts from the -rc cycle against the rdma.git tree:
Conflicts:
drivers/infiniband/core/uverbs_cmd.c
- New ifs added to ib_uverbs_ex_create_flow in -rc and for-next
- Merge removal of file->ucontext in for-next with new code in -rc
drivers/infiniband/core/uverbs_main.c
- for-next removed code from ib_uverbs_write() that was modified
in for-rc
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'net/rds/ib_frmr.c')
| -rw-r--r-- | net/rds/ib_frmr.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/rds/ib_frmr.c b/net/rds/ib_frmr.c index 09ab97475fc9..b371cf08b1fc 100644 --- a/net/rds/ib_frmr.c +++ b/net/rds/ib_frmr.c @@ -339,6 +339,11 @@ struct rds_ib_mr *rds_ib_reg_frmr(struct rds_ib_device *rds_ibdev, struct rds_ib_frmr *frmr; int ret; + if (!ic) { + /* TODO: Add FRWR support for RDS_GET_MR using proxy qp*/ + return ERR_PTR(-EOPNOTSUPP); + } + do { if (ibmr) rds_ib_free_frmr(ibmr, true); |