From patchwork Fri Dec 7 08:30:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tarick Bedeir X-Patchwork-Id: 1009210 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="uCZltnFR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43B5K65kVtz9s55 for ; Fri, 7 Dec 2018 19:31:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726045AbeLGIbB (ORCPT ); Fri, 7 Dec 2018 03:31:01 -0500 Received: from mail-pf1-f202.google.com ([209.85.210.202]:39828 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725966AbeLGIbA (ORCPT ); Fri, 7 Dec 2018 03:31:00 -0500 Received: by mail-pf1-f202.google.com with SMTP id 68so2717623pfr.6 for ; Fri, 07 Dec 2018 00:30:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=h0iwBJAI3blijsYGp3lEIcvTsTsYT9KN9COxBytQTOM=; b=uCZltnFR7ax58zqG9scJ9N8E4r+dnuVYScOA347gjSPuL2UwS5lSXYU5kZNbE8SRRc VPeRo3+CQ7rjqAYQPU35WC86flUef44CRiMYhVR6XCnvklRJkFoIHz1FSI15fkqRX7pM QDKgwfJWcCJf/DygsHzjFnDRu3B28z07It0IpYIMXlSvKmGtylULsCuJ2Ny2A8+TjpL+ 5ADrCuhYW2zntZBy/Bey+X53Pn+f7Ix0tctwORs7Oq2qk87w8s+NbOp+2yKyIqyAKWoH PIFAm/rV7FdasptsQHU+6aAU37zGWz/CUwvsthgxJehkwZrldOXU6i4lTviQD6nGTZPB NgUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=h0iwBJAI3blijsYGp3lEIcvTsTsYT9KN9COxBytQTOM=; b=QXz6KQvre11HuH1CLGZo+SnDdEgZyoI6LBmJh6mEgz5LiK34/+snWi9piEtX1bzJmY JraQM2bIMpjBRV5YFebRZiI0s7DbN3klyxp8BF7saIUOPv/zSv1OqYrqdVeI2EsKEGB2 lyUYrCQXyuzFMsSQG1050ks8bIYqCJcR4dEIYO2phva8wmigtLM6cle5DFvwh7E3TSaw Xb/BJc1jHXknOmsxNgj5rUUrfvnqY2OdcKTWBZB4kB3FWfMjvpduYdAEZFQ5oPxBx9XV gxw/hqir4d3SN+PeZWZYeGRp7PSIs3xo5idCyzEMmdmVuoHJ8q/YyNB29AemMkqw6Yuq 3Jlg== X-Gm-Message-State: AA+aEWYTSESsaotF8/eqsc4FSXkwmRAP3WMm5SNX7Llq9jqV1O+Yph31 VVDwDT5ppKXTHd/j2qXKJSHTc0i4RA== X-Google-Smtp-Source: AFSGD/WuxSPP9EfYkvdsWEKinjIInY73AbcqeXCXJTZGHGbuSCQQztpzkl4/IzMS+HK8qM+qymC7Mx9pTQs= X-Received: by 2002:a62:61c7:: with SMTP id v190mr446590pfb.53.1544171459515; Fri, 07 Dec 2018 00:30:59 -0800 (PST) Date: Fri, 7 Dec 2018 00:30:26 -0800 Message-Id: <20181207083026.173789-1-tarick@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog Subject: [PATCH] net/mlx4_core: Correctly set PFC param if global pause is turned off. From: Tarick Bedeir To: Eran Ben Elisha , Tariq Toukan , "David S. Miller" Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Tarick Bedeir Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rx_ppp and tx_ppp can be set between 0 and 255, so don't clamp to 1. Fixes: 6e8814ceb7e8 ("net/mlx4_en: Fix mixed PFC and Global pause user control requests") Signed-off-by: Tarick Bedeir Reviewed-by: Eran Ben Elisha --- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c index f11b45001cad..d290f0787dfb 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c @@ -1084,8 +1084,8 @@ static int mlx4_en_set_pauseparam(struct net_device *dev, tx_pause = !!(pause->tx_pause); rx_pause = !!(pause->rx_pause); - rx_ppp = priv->prof->rx_ppp && !(tx_pause || rx_pause); - tx_ppp = priv->prof->tx_ppp && !(tx_pause || rx_pause); + rx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->rx_ppp; + tx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->tx_ppp; err = mlx4_SET_PORT_general(mdev->dev, priv->port, priv->rx_skb_size + ETH_FCS_LEN,