Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp426259imu; Wed, 12 Dec 2018 20:34:48 -0800 (PST) X-Google-Smtp-Source: AFSGD/Ue4QoCuMollgpxfh1gmh5Eqiy9KXy4/6B6emQ/nE82ub99v1AT4RtczR9SZFqNT6EyeM5A X-Received: by 2002:a17:902:108a:: with SMTP id c10mr22684159pla.131.1544675688687; Wed, 12 Dec 2018 20:34:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544675688; cv=none; d=google.com; s=arc-20160816; b=arlU+bS7YIj3vQbnaG8AxZyvTzN1f0XiCxX674qIj7hOR0ied0Yv+tjbn2PIG6aUeW dAXww2mwgkOSfYyoyQJ4WS/bE/46PtZf95qFTclMkddY6QbP2VMxua68X9vgaWvGNph3 vxucIKDBPIgqI9RDQV76h3g77CyNlCAUAohKde1pOKvs/m9criYhe2IOpNiTE1DyL9q/ dNFVWj2vs9X+QdwsYvUgf8ckOn1Ew/8WBEy0I+TU5A+Res8xVsQd9yvrt54CPqLZBGKh up2wBnuRogOPIa6pFcLY3/47MWxoQKTvnozpAHcYbub+bXOptW2NVT+YAXsPkHoYX9aA DnBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Bcb95/6KIrQssw3gF9FsapxtVNmXZ4AUpNhkwqTRLkQ=; b=Oe2W8La9fFiitslFZ9PSrU7JF08Sy9vI36nhoD2TdBWE8qXwnnrvvszokBlh55a0cO 1CIyKqGriaWzM6jjaOGfg/ehQNA1M1nD1jVtoZRIrscVvFfSrGpVT27lNjWHV0C46Xi+ pDHxFphgR2FrKlVhTAkRpsgCmUEadaN/hvCw8YTiPEcluNQUEaKPLIkPv5Ii5KrALYIH vZu740xQ55ozWOD+rEvPNa1mHV3nTD7cu2x69o3iZ7idNgZvCVtRV+HH/GjX1r9bQi3O ZsCFpbkxA+XcfK/zjJTLt1vED2CSfzEyGey8LgZ/hYXbK6nW9k8TKhBNgK79tybXLPBQ oCdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fL1M2PA0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h36si641160pgm.200.2018.12.12.20.34.33; Wed, 12 Dec 2018 20:34:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fL1M2PA0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729235AbeLMEdC (ORCPT + 99 others); Wed, 12 Dec 2018 23:33:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:45810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728532AbeLMEc7 (ORCPT ); Wed, 12 Dec 2018 23:32:59 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E3DFE20879; Thu, 13 Dec 2018 04:32:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675578; bh=tgw2o/ELW3xKp7gmQ92MEG20bEigBPPWCZ+A2wVDJKY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fL1M2PA0jmJi5d8tl1GarUWfJoAcnB1gQm2g67ALyGyNLcBozY/0yEa3O+fvY4HT7 f+tRdjoI3KiUKyp2XroF1PH+nWzT89Vxfg3VtVcPryh9mE15fFb+I8225RdIPq1K4y j1g+wzNwIfDNUNud5lWjcnbrrrjrXhpFUcjcj1Z0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tarick Bedeir , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 34/34] net/mlx4_core: Correctly set PFC param if global pause is turned off. Date: Wed, 12 Dec 2018 23:32:00 -0500 Message-Id: <20181213043200.76295-34-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213043200.76295-1-sashal@kernel.org> References: <20181213043200.76295-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tarick Bedeir [ Upstream commit bd5122cd1e0644d8bd8dd84517c932773e999766 ] 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- 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 9a4c4f8281bd..8a9a332d78b4 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c @@ -1027,8 +1027,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, -- 2.19.1