diff options
| author | Saeed Mahameed <saeedm@mellanox.com> | 2019-08-28 11:45:03 -0700 |
|---|---|---|
| committer | Saeed Mahameed <saeedm@mellanox.com> | 2019-08-28 11:48:56 -0700 |
| commit | 537f321097d03c21f46c56741cda0dfa6eeffcdd (patch) | |
| tree | f3d8f48428c346288cd07cd1d075fafc9707479b /include/linux/mlx5/driver.h | |
| parent | 00ebd4998b53829d7bd95548543b1eb8a676c44d (diff) | |
| parent | 00679b631eddaa0aa0ceba719fcb1f60c65da5a3 (diff) | |
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
mlx5 HW spec and bits updates:
1) Aya exposes IP-in-IP capability in mlx5_core.
2) Maxim exposes lag tx port affinity capabilities.
3) Moshe adds VNIC_ENV internal rq counter bits.
4) ODP capabilities for DC transport
Misc updates:
5) Saeed, two compiler warnings cleanups
6) Add XRQ legacy commands opcodes
7) Use refcount_t for refcount
8) fix a -Wstringop-truncation warning
Diffstat (limited to 'include/linux/mlx5/driver.h')
| -rw-r--r-- | include/linux/mlx5/driver.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index 13b4cf22f3ab..52a56d741f79 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h @@ -47,6 +47,7 @@ #include <linux/interrupt.h> #include <linux/idr.h> #include <linux/notifier.h> +#include <linux/refcount.h> #include <linux/mlx5/device.h> #include <linux/mlx5/doorbell.h> @@ -390,7 +391,7 @@ enum mlx5_res_type { struct mlx5_core_rsc_common { enum mlx5_res_type res; - atomic_t refcount; + refcount_t refcount; struct completion free; }; |