From mboxrd@z Thu Jan 1 00:00:00 1970 From: Amir Vadai Subject: [PATCH net-next V1 1/4] net/mlx4_en: Disable global flow control when PFC enabled Date: Tue, 20 Aug 2013 18:42:46 +0300 Message-ID: <1377013369-14711-2-git-send-email-amirv@mellanox.com> References: <1377013369-14711-1-git-send-email-amirv@mellanox.com> Cc: netdev@vger.kernel.org, Amir Vadai , Eugenia Emantayev To: "David S. Miller" Return-path: Received: from mailp.voltaire.com ([193.47.165.129]:58630 "EHLO mellanox.co.il" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751633Ab3HTPnN (ORCPT ); Tue, 20 Aug 2013 11:43:13 -0400 In-Reply-To: <1377013369-14711-1-git-send-email-amirv@mellanox.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Eugenia Emantayev Fix a bug when FC and PFC are enabled/disabled at the same time. According to ConnectX-3 Programmer Manual these two features are mutial exclusive. So make sure when enabling PFC to turn off global FC and vise versa. Otherwise it hurts the performance. Signed-off-by: Eugenia Emantayev Signed-off-by: Amir Vadai --- drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c index 9d4a1ea..fcef764 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c @@ -169,7 +169,8 @@ static int mlx4_en_dcbnl_ieee_setpfc(struct net_device *dev, pfc->mbc, pfc->delay); - priv->prof->rx_pause = priv->prof->tx_pause = !!pfc->pfc_en; + priv->prof->rx_pause = !pfc->pfc_en; + priv->prof->tx_pause = !pfc->pfc_en; priv->prof->rx_ppp = priv->prof->tx_ppp = pfc->pfc_en; err = mlx4_SET_PORT_general(mdev->dev, priv->port, -- 1.8.3.4