diff options
| author |   Huy Nguyen <huyn@mellanox.com> | 2017-07-13 13:45:11 -0500 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-09-20 08:22:08 +0200 |
| commit | 9b919ad3f99f689c169c7fbd9ba7ac164f51c23b (patch) | |
| tree | f1094ce8b313760fb6b1518c155d143dfad7d520 | |
| parent | net: dsa: bcm_sf2: Fix number of CFP entries for BCM7278 (diff) | |
| download | linux-stable-9b919ad3f99f689c169c7fbd9ba7ac164f51c23b.tar.xz linux-stable-9b919ad3f99f689c169c7fbd9ba7ac164f51c23b.zip | |
net/mlx5e: Check for qos capability in dcbnl_initialize
[ Upstream commit 33c52b6718d2a6cb414440c98560818910d896dc ]
qos capability is the master capability bit that determines
if the DCBX is supported for the PCI function. If this bit is off,
driver cannot run any dcbx code.
Fixes: e207b7e99176 ("net/mlx5e: ConnectX-4 firmware support for DCBX")
Signed-off-by: Huy Nguyen <huyn@mellanox.com>
Reviewed-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c index 2eb54d36e16e..810b51029c7f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c @@ -754,6 +754,9 @@ void mlx5e_dcbnl_initialize(struct mlx5e_priv *priv) { struct mlx5e_dcbx *dcbx = &priv->dcbx; + if (!MLX5_CAP_GEN(priv->mdev, qos)) + return; + if (MLX5_CAP_GEN(priv->mdev, dcbx)) mlx5e_dcbnl_query_dcbx_mode(priv, &dcbx->mode); |