From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id BBC1D1B94D for ; Fri, 14 Dec 2018 18:53:09 +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 28770753E9; Fri, 14 Dec 2018 17:53:09 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-116-106.ams2.redhat.com [10.36.116.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id D431860BF7; Fri, 14 Dec 2018 17:53:07 +0000 (UTC) From: Kevin Traynor To: Didier Pallard Cc: Qi Zhang , dpdk stable Date: Fri, 14 Dec 2018 17:52:02 +0000 Message-Id: <20181214175203.24908-18-ktraynor@redhat.com> In-Reply-To: <20181214175203.24908-1-ktraynor@redhat.com> References: <20181214175203.24908-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.39]); Fri, 14 Dec 2018 17:53:09 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: revert fix offload not supported 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2018 17:53:10 -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 12/18/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 0fcd6b608ec0130804824d080bd4cdaf5574cb0f Mon Sep 17 00:00:00 2001 From: Didier Pallard Date: Tue, 11 Dec 2018 18:25:01 +0100 Subject: [PATCH] net/i40e: revert fix offload not supported mask [ upstream commit e51da4bbaf3584e16cbd0ea0b1b85343b777134f ] This reverts commit 09a62d75691f ("net/i40e: fix offload not supported mask") Contrary to what is said in above patch commit log, I40E_TX_OFFLOAD_NOTSUP_MASK is the mask of Tx offload bits that are part of PKT_TX_OFFLOAD_MASK but not included in I40E_TX_OFFLOAD_MASK. Above patch erroneously includes all PKT_RX_OFFLOAD_ bits in the I40E_TX_OFFLOAD_NOTSUP_MASK, this is not what is expected. Restore the initial xor that gives the expected result. Fixes: 09a62d75691f ("net/i40e: fix offload not supported mask") Signed-off-by: Didier Pallard Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index e0d53d022..7cc35c19c 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -70,5 +70,5 @@ #define I40E_TX_OFFLOAD_NOTSUP_MASK \ - ~(PKT_TX_OFFLOAD_MASK & I40E_TX_OFFLOAD_MASK) + (PKT_TX_OFFLOAD_MASK ^ I40E_TX_OFFLOAD_MASK) static inline void -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-12-14 17:49:48.213901542 +0000 +++ 0018-net-i40e-revert-fix-offload-not-supported-mask.patch 2018-12-14 17:49:47.000000000 +0000 @@ -1,8 +1,10 @@ -From e51da4bbaf3584e16cbd0ea0b1b85343b777134f Mon Sep 17 00:00:00 2001 +From 0fcd6b608ec0130804824d080bd4cdaf5574cb0f Mon Sep 17 00:00:00 2001 From: Didier Pallard Date: Tue, 11 Dec 2018 18:25:01 +0100 Subject: [PATCH] net/i40e: revert fix offload not supported mask +[ upstream commit e51da4bbaf3584e16cbd0ea0b1b85343b777134f ] + This reverts commit 09a62d75691f ("net/i40e: fix offload not supported mask") @@ -14,7 +16,6 @@ Restore the initial xor that gives the expected result. Fixes: 09a62d75691f ("net/i40e: fix offload not supported mask") -Cc: stable@dpdk.org Signed-off-by: Didier Pallard Acked-by: Qi Zhang @@ -23,7 +24,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c -index e1152ff0e..ab74a488f 100644 +index e0d53d022..7cc35c19c 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -70,5 +70,5 @@