diff options
author | Doug Ledford <dledford@redhat.com> | 2019-07-29 13:38:42 -0400 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2019-07-29 13:38:42 -0400 |
commit | 525a2c651cdd08b19a4c04f63b87e460765220ac (patch) | |
tree | ad65ead1b0a281be08e5c47e2a7eb911dd0d2a9b /drivers/infiniband/hw/mlx5/mlx5_ib.h | |
parent | IB/mlx5: Support per device q counters in switchdev mode (diff) | |
parent | Do not dereference 'siw_crypto_shash' before checking (diff) | |
download | linux-dev-525a2c651cdd08b19a4c04f63b87e460765220ac.tar.xz linux-dev-525a2c651cdd08b19a4c04f63b87e460765220ac.zip |
Merge branch 'wip/dl-for-rc' into wip/dl-for-next
The fix for IB port statistics initialization ("IB/core: Fix querying
total rdma stats") is needed before we take a follow-on patch to
for-next.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/mlx5/mlx5_ib.h')
-rw-r--r-- | drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h index 7a62454ad979..cb41a7e6255a 100644 --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h @@ -481,6 +481,7 @@ struct mlx5_umr_wr { u64 length; int access_flags; u32 mkey; + u8 ignore_free_state:1; }; static inline const struct mlx5_umr_wr *umr_wr(const struct ib_send_wr *wr) |