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 /drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | |
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 'drivers/net/ethernet/mellanox/mlx5/core/eswitch.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c index f0692407f617..30aae76b6a1d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c @@ -1413,7 +1413,7 @@ out: static bool element_type_supported(struct mlx5_eswitch *esw, int type) { - struct mlx5_core_dev *dev = esw->dev = esw->dev; + const struct mlx5_core_dev *dev = esw->dev; switch (type) { case SCHEDULING_CONTEXT_ELEMENT_TYPE_TSAR: |