diff options
| author | David S. Miller <davem@davemloft.net> | 2020-09-10 22:49:00 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-10 22:49:00 +0300 |
| commit | 8b40f21b699df25dcc8b98d0de7774a1e45fca4f (patch) | |
| tree | 1f2e7506a73cbf66a143b9c057a932790db24d97 /drivers/net | |
| parent | 6eb8b7fbe3915921738b2cac211ff65b75750a04 (diff) | |
| parent | 0313c7c2e45c40c8f2e4156672125a9756e6d8a1 (diff) | |
| download | linux-8b40f21b699df25dcc8b98d0de7774a1e45fca4f.tar.xz | |
Merge branch 'mlx4-avoid-devlink-port-type-not-set-warnings'
Jakub Kicinski says:
====================
mlx4: avoid devlink port type not set warnings
This small set addresses the issue of mlx4 potentially not setting
devlink port type when Ethernet or IB driver is not built, but
port has that type.
v2:
- add patch 1
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 258c7a96f269..70cf24ba71e4 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -3031,6 +3031,17 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port) if (err) return err; + /* Ethernet and IB drivers will normally set the port type, + * but if they are not built set the type now to prevent + * devlink_port_type_warn() from firing. + */ + if (!IS_ENABLED(CONFIG_MLX4_EN) && + dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH) + devlink_port_type_eth_set(&info->devlink_port, NULL); + else if (!IS_ENABLED(CONFIG_MLX4_INFINIBAND) && + dev->caps.port_type[port] == MLX4_PORT_TYPE_IB) + devlink_port_type_ib_set(&info->devlink_port, NULL); + info->dev = dev; info->port = port; if (!mlx4_is_slave(dev)) { |