diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-18 10:19:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-18 10:19:12 -0700 |
| commit | 01c8d80383d9076ab4fbebc3e60ae9abc70f70d5 (patch) | |
| tree | 8efef3aaadcc9085bd098f60f710cd6c9eb82e4c /include/linux | |
| parent | Linux 5.1-rc1 (diff) | |
| parent | i40iw: Avoid panic when handling the inetdev event (diff) | |
| download | linux-dev-01c8d80383d9076ab4fbebc3e60ae9abc70f70d5.tar.xz linux-dev-01c8d80383d9076ab4fbebc3e60ae9abc70f70d5.zip | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma fixes from Jason Gunthorpe:
"Several driver bug fixes post in the last three weeks
- first part of a race condition fix in mlx4 with CATAS errors
- bad interaction with FW causing resource leaks in the mlx5 DCT flow
- bad reporting of link speed/width in new mlx5 devices
- user triggable OOPS in i40iw"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
i40iw: Avoid panic when handling the inetdev event
IB/mlx5: Fix mapping of link-mode to IB width and speed
IB/mlx5: Use mlx5 core to create/destroy a DEVX DCT
net/mlx5: Fix DCT creation bad flow
IB/mlx4: Fix race condition between catas error reset and aliasguid flows
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx5/qp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h index b26ea9077384..0343c81d4c5f 100644 --- a/include/linux/mlx5/qp.h +++ b/include/linux/mlx5/qp.h @@ -557,7 +557,8 @@ static inline struct mlx5_core_mkey *__mlx5_mr_lookup(struct mlx5_core_dev *dev, int mlx5_core_create_dct(struct mlx5_core_dev *dev, struct mlx5_core_dct *qp, - u32 *in, int inlen); + u32 *in, int inlen, + u32 *out, int outlen); int mlx5_core_create_qp(struct mlx5_core_dev *dev, struct mlx5_core_qp *qp, u32 *in, |