diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-22 09:00:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-22 09:00:23 +0200 |
| commit | 6acf116c9558314d3cac36d5eb17f30368c73fd2 (patch) | |
| tree | 385d0f4811ca8e0bf2deed3d58516b7e97054242 /include/linux/mlx5/fs.h | |
| parent | USB: ene_usb6250: turn off the Removable flag (diff) | |
| parent | Linux 4.12-rc2 (diff) | |
| download | linux-dev-6acf116c9558314d3cac36d5eb17f30368c73fd2.tar.xz linux-dev-6acf116c9558314d3cac36d5eb17f30368c73fd2.zip | |
Merge 4.12-rc2 into usb-next
We want the USB fixes in here as well to handle testing and merge
issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/mlx5/fs.h')
| -rw-r--r-- | include/linux/mlx5/fs.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h index 1b166d2e19c5..b25e7baa273e 100644 --- a/include/linux/mlx5/fs.h +++ b/include/linux/mlx5/fs.h @@ -109,7 +109,6 @@ struct mlx5_flow_table_attr { int max_fte; u32 level; u32 flags; - u32 underlay_qpn; }; struct mlx5_flow_table * @@ -167,4 +166,7 @@ struct mlx5_fc *mlx5_fc_create(struct mlx5_core_dev *dev, bool aging); void mlx5_fc_destroy(struct mlx5_core_dev *dev, struct mlx5_fc *counter); void mlx5_fc_query_cached(struct mlx5_fc *counter, u64 *bytes, u64 *packets, u64 *lastuse); +int mlx5_fs_add_rx_underlay_qpn(struct mlx5_core_dev *dev, u32 underlay_qpn); +int mlx5_fs_remove_rx_underlay_qpn(struct mlx5_core_dev *dev, u32 underlay_qpn); + #endif |