diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-02-17 23:59:33 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-02-17 23:59:33 +0300 |
| commit | 8fab3d713ca36bf4ad4dadec0bf38f5e70b8999d (patch) | |
| tree | 18cdadced0870584ceffa02eed47f4c86da8263c /drivers/infiniband/core/nldev.c | |
| parent | 760a160e8b899f5ebcab99da17feebbe40ec42f1 (diff) | |
| parent | 68b7587baabfa42ca5625b709691358fee51b9d8 (diff) | |
| download | linux-8fab3d713ca36bf4ad4dadec0bf38f5e70b8999d.tar.xz | |
Merge tag 'gpio-v5.1-updates-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel
gpio updates for v5.1
- support for a new variant of pca953x
- documentation fix from Wolfram
- some tegra186 name changes
- two minor fixes for madera and altera-a10sr
Diffstat (limited to 'drivers/infiniband/core/nldev.c')
| -rw-r--r-- | drivers/infiniband/core/nldev.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c index e600fc23ae62..3c97a8b6bf1e 100644 --- a/drivers/infiniband/core/nldev.c +++ b/drivers/infiniband/core/nldev.c @@ -584,10 +584,6 @@ static int fill_res_pd_entry(struct sk_buff *msg, struct netlink_callback *cb, if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_RES_USECNT, atomic_read(&pd->usecnt), RDMA_NLDEV_ATTR_PAD)) goto err; - if ((pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY) && - nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY, - pd->unsafe_global_rkey)) - goto err; if (fill_res_name_pid(msg, res)) goto err; |