Patch "net/mlx5e: Check for qos capability in dcbnl_initialize" has been added to the 4.12-stable tree

Patch "net/mlx5e: Check for qos capability in dcbnl_initialize" has been added to the 4.12-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    net/mlx5e: Check for qos capability in dcbnl_initialize

to the 4.12-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-mlx5e-check-for-qos-capability-in-dcbnl_initialize.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Thu Sep 14 23:20:23 PDT 2017
From: Huy Nguyen <huyn@mellanox.com>
Date: Thu, 13 Jul 2017 13:45:11 -0500
Subject: net/mlx5e: Check for qos capability in dcbnl_initialize

From: Huy Nguyen <huyn@mellanox.com>


[ 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>
---
 drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c |    3 +++
 1 file changed, 3 insertions(+)

--- 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
 {
 	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);
 


Patches currently in stable-queue which might be from huyn@mellanox.com are

queue-4.12/net-mlx5e-fix-dcb_cap_attr_dcbx-capability-for-dcbnl-getcap.patch
queue-4.12/net-mlx5e-check-for-qos-capability-in-dcbnl_initialize.patch