diff options
| author | Jiri Pirko | 2018-04-01 16:34:57 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-04-01 16:56:43 +0200 |
| commit | ad3f20b28602fd46b3a27b5a61be270a3794cc36 (patch) | |
| tree | 68c04dfe9433f582d449d177650d4189029427d8 /drivers/net/ethernet/mellanox/mlxsw/core.c | |
| parent | mlxsw: Move "used_kvd_sizes" check to mlxsw_pci_config_profile (diff) | |
| download | kernel-qcow2-linux-ad3f20b28602fd46b3a27b5a61be270a3794cc36.tar.gz kernel-qcow2-linux-ad3f20b28602fd46b3a27b5a61be270a3794cc36.tar.xz kernel-qcow2-linux-ad3f20b28602fd46b3a27b5a61be270a3794cc36.zip | |
mlxsw: Move "resources_query_enable" out of mlxsw_config_profile
As struct mlxsw_config_profile is mapped to the payload of the FW
command of the same name, resources_query_enable flag does not belong
there. Move it to struct mlxsw_driver.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlxsw/core.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index 3529b545675d..93ea56620a24 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1008,6 +1008,7 @@ int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, const char *device_kind = mlxsw_bus_info->device_kind; struct mlxsw_core *mlxsw_core; struct mlxsw_driver *mlxsw_driver; + struct mlxsw_res *res; size_t alloc_size; int err; @@ -1032,8 +1033,8 @@ int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, mlxsw_core->bus_priv = bus_priv; mlxsw_core->bus_info = mlxsw_bus_info; - err = mlxsw_bus->init(bus_priv, mlxsw_core, mlxsw_driver->profile, - &mlxsw_core->res); + res = mlxsw_driver->res_query_enabled ? &mlxsw_core->res : NULL; + err = mlxsw_bus->init(bus_priv, mlxsw_core, mlxsw_driver->profile, res); if (err) goto err_bus_init; |