From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <luca.boccassi@gmail.com>
Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65])
 by dpdk.org (Postfix) with ESMTP id 493311DB3
 for <stable@dpdk.org>; Mon, 30 Apr 2018 16:07:19 +0200 (CEST)
Received: by mail-wm0-f65.google.com with SMTP id t11so13436155wmt.0
 for <stable@dpdk.org>; Mon, 30 Apr 2018 07:07:19 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references;
 bh=sjwXeoB4BsIvgNBjcTbb9LcbxpcCzWmZPEIGFEpIhMY=;
 b=DsNxTQBQOIvhgduL6hnpVCJ6KQ5So+dHPagA5DEmmu8R/dvnDh6F09ma7DDrcOx8C8
 6j9sO7/4qHajVtbveIzQc6PfDtNQMrGf+OKBV9PEBj5Xa8Y6VG5Wa/Xn5ZRsuox82gyA
 Qz1i2TGgBYR/glIllJVXBmhbD5+VEwPd25sc3Ox467FiLocrCw2dN+zDDLMwxzOheDNX
 nh64jElFY3RAb9chyqUbbCC5Orc3/8NQReA0u5SEA9cAixSujI3IQCzrbwbFOCAKdjY/
 2Le6ybDbxiSRcYDx7EKgk/KYW1BAyZteHtup2Ehx0wHOGnfn4Y6puDLlhsfE5dZxFn6s
 2X0A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references;
 bh=sjwXeoB4BsIvgNBjcTbb9LcbxpcCzWmZPEIGFEpIhMY=;
 b=acrYDJXgEv6G4fIOZq6xlAHE4cdH4S8spAfIs47H9ax1c4c4JvD0t1xxUI3q1fm3wT
 emm9LeMoDwtZNeg4itFZ2OazpigG50yfQDH6A3ecc2w7U/AxGaKkPlwrrYk8feyTvrLw
 bhgZTyIyQZug6vE9nl2dnnmY0XwR1LdxWJ7ESirYCPir+D2q7SZwPi1TPsr6H/YMfMsg
 9d7/gs7GLej7wCcggFb4rfQNOGBCnCgh8MrhUgksEZ+Nxc+yGwVUrpUJRdWM3O2GKsLH
 /+Yw6lx3Zk6cLUBG2WeBoKKrlOOqGNGprW8b00iQrStm87LSKeBuRPrK9VEBsH9iAug+
 jDcA==
X-Gm-Message-State: ALQs6tCOcKvkJuHnM34Kxt8JMWa5XNHIyPHlRZNOWYvoruwCsviAh6QN
 faAAhVq2i+MuE56sZlcIheo0e3ZM2/s=
X-Google-Smtp-Source: AB8JxZrlixOwXjgC5tV/1i+W6NNmfuGDm2+B5Ohc8tHjW4KqJUmtSAS5BGv8Nlwub+6K5/Kxv+XsWA==
X-Received: by 10.28.7.207 with SMTP id 198mr5749297wmh.149.1525097238999;
 Mon, 30 Apr 2018 07:07:18 -0700 (PDT)
Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb])
 by smtp.gmail.com with ESMTPSA id k3-v6sm11251698wri.28.2018.04.30.07.07.17
 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
 Mon, 30 Apr 2018 07:07:18 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Yongseok Koh <yskoh@mellanox.com>
Cc: Shahaf Shuler <shahafs@mellanox.com>,
 Nelio Laranjeiro <nelio.laranjeiro@6wind.com>,
 dpdk stable <stable@dpdk.org>
Date: Mon, 30 Apr 2018 15:03:12 +0100
Message-Id: <20180430140606.4615-34-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.14.2
In-Reply-To: <20180430140606.4615-1-luca.boccassi@gmail.com>
References: <20180430140606.4615-1-luca.boccassi@gmail.com>
Subject: [dpdk-stable] patch 'net/mlx5: fix disabling Tx packet inlining'
	has been queued to stable release 18.02.2
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/stable>,
 <mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/stable>,
 <mailto:stable-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2018 14:07:19 -0000

Hi,

FYI, your patch has been queued to stable release 18.02.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/02/18. So please
shout if anyone has objections.

Thanks.

Luca Boccassi

---
>>From ae1d7471768b3107ca7e9674f1f198554e7dc6ed Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh@mellanox.com>
Date: Mon, 26 Feb 2018 09:50:57 -0800
Subject: [PATCH] net/mlx5: fix disabling Tx packet inlining

[ upstream commit 24a8f52455ff69826da460068ba1a5db17cc1085 ]

Adding 'txq_inline=0' to PMD parameter should disable Tx packet inlining
but it doesn't work properly for Enhanced Multi-Packet Send.

Fixes: 6ce84bd88919 ("net/mlx5: add enhanced multi-packet send for ConnectX-5")

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
---
 drivers/net/mlx5/mlx5_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index dc4ead934..049f7e6c1 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -1382,7 +1382,7 @@ txq_burst_empw(struct mlx5_txq_data *txq, struct rte_mbuf **pkts,
 				(!txq->mpw_hdr_dseg ||
 				 mpw.total_len >= MLX5_WQE_SIZE);
 		}
-		if (do_inline) {
+		if (max_inline && do_inline) {
 			/* Inline packet into WQE. */
 			unsigned int max;
 
-- 
2.14.2