From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ktraynor@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
by dpdk.org (Postfix) with ESMTP id 484381B488
for <stable@dpdk.org>; Thu, 22 Nov 2018 17:53:17 +0100 (CET)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id AD0EB2D809;
Thu, 22 Nov 2018 16:53:16 +0000 (UTC)
Received: from ktraynor.remote.csb (unknown [10.36.118.7])
by smtp.corp.redhat.com (Postfix) with ESMTP id 3034160E3F;
Thu, 22 Nov 2018 16:53:15 +0000 (UTC)
From: Kevin Traynor <ktraynor@redhat.com>
To: Zhirun Yan <zhirun.yan@intel.com>
Cc: Xiaolong Ye <xiaolong.ye@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Thu, 22 Nov 2018 16:49:48 +0000
Message-Id: <20181122164957.13003-56-ktraynor@redhat.com>
In-Reply-To: <20181122164957.13003-1-ktraynor@redhat.com>
References: <20181122164957.13003-1-ktraynor@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.30]); Thu, 22 Nov 2018 16:53:16 +0000 (UTC)
Subject: [dpdk-stable] patch 'net/ixgbe: update Tx offload mask' has been
queued to stable release 18.08.1
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://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Nov 2018 16:53:17 -0000
Hi,
FYI, your patch has been queued to stable release 18.08.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/28/18. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.
Thanks.
Kevin Traynor
---
>>From b9f9c3e1e07189d654bcdd5229f3ebf8fd775ab4 Mon Sep 17 00:00:00 2001
From: Zhirun Yan <zhirun.yan@intel.com>
Date: Thu, 25 Oct 2018 14:58:40 +0000
Subject: [PATCH] net/ixgbe: update Tx offload mask
[ upstream commit aa1e69aebb12a57038f7ed5664605b7bcccbbe20 ]
Tx offload mask is updated in following commit: commit 1037ed842c37
("mbuf: fix Tx offload mask"). Currently, the new added offload
flags are not supported in PMD and application will fail to call
PMD transmit prepare function.
This patch updates IXGBE_TX_OFFFLOAD_MASK.
Fixes: 1037ed842c37 ("mbuf: fix Tx offload mask")
Signed-off-by: Zhirun Yan <zhirun.yan@intel.com>
Reviewed-by: Xiaolong Ye <xiaolong.ye@intel.com>
---
drivers/net/ixgbe/ixgbe_rxtx.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index b0172a7d2..792727353 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -59,4 +59,8 @@
/* Bit Mask to indicate what bits required for building TX context */
#define IXGBE_TX_OFFLOAD_MASK ( \
+ PKT_TX_OUTER_IPV6 | \
+ PKT_TX_OUTER_IPV4 | \
+ PKT_TX_IPV6 | \
+ PKT_TX_IPV4 | \
PKT_TX_VLAN_PKT | \
PKT_TX_IP_CKSUM | \
--
2.19.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2018-11-22 16:47:33.739716540 +0000
+++ 0056-net-ixgbe-update-Tx-offload-mask.patch 2018-11-22 16:47:32.000000000 +0000
@@ -1,8 +1,10 @@
-From aa1e69aebb12a57038f7ed5664605b7bcccbbe20 Mon Sep 17 00:00:00 2001
+From b9f9c3e1e07189d654bcdd5229f3ebf8fd775ab4 Mon Sep 17 00:00:00 2001
From: Zhirun Yan <zhirun.yan@intel.com>
Date: Thu, 25 Oct 2018 14:58:40 +0000
Subject: [PATCH] net/ixgbe: update Tx offload mask
+[ upstream commit aa1e69aebb12a57038f7ed5664605b7bcccbbe20 ]
+
Tx offload mask is updated in following commit: commit 1037ed842c37
("mbuf: fix Tx offload mask"). Currently, the new added offload
flags are not supported in PMD and application will fail to call
@@ -11,7 +13,6 @@
This patch updates IXGBE_TX_OFFFLOAD_MASK.
Fixes: 1037ed842c37 ("mbuf: fix Tx offload mask")
-Cc: stable@dpdk.org
Signed-off-by: Zhirun Yan <zhirun.yan@intel.com>
Reviewed-by: Xiaolong Ye <xiaolong.ye@intel.com>
@@ -20,7 +21,7 @@
1 file changed, 4 insertions(+)
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
-index 9e2fbba3e..2f0262ae1 100644
+index b0172a7d2..792727353 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -59,4 +59,8 @@