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 EF6605689 for ; Tue, 20 Nov 2018 20:14:49 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5DE3630841DE; Tue, 20 Nov 2018 19:14:49 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 280D860141; Tue, 20 Nov 2018 19:14:47 +0000 (UTC) From: Kevin Traynor To: Yaroslav Brustinov Cc: Qi Zhang , dpdk stable Date: Tue, 20 Nov 2018 19:12:11 +0000 Message-Id: <20181120191252.30277-21-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 20 Nov 2018 19:14:49 +0000 (UTC) Subject: [dpdk-stable] patch 'net/e1000: fix Tx offload capability typos' 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: Tue, 20 Nov 2018 19:14:50 -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/23/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 02f25b4214d362f19b265066c71c2b1d2204f834 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Wed, 8 Aug 2018 12:45:21 +0300 Subject: [PATCH] net/e1000: fix Tx offload capability typos [ upstream commit daa3b0833f086c520696433e056b3c97a570370a ] Fix rx/tx typos in igb_get_tx_port_offloads_capa and igb_get_tx_queue_offloads_capa. Fixes: e5c05e6590ea ("net/e1000: convert to new Tx offloads API") Signed-off-by: Yaroslav Brustinov Acked-by: Qi Zhang --- drivers/net/e1000/igb_rxtx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c index b955068a8..8aefd976a 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -1453,8 +1453,8 @@ uint64_t igb_get_tx_port_offloads_capa(struct rte_eth_dev *dev) { - uint64_t rx_offload_capa; + uint64_t tx_offload_capa; RTE_SET_USED(dev); - rx_offload_capa = DEV_TX_OFFLOAD_VLAN_INSERT | + tx_offload_capa = DEV_TX_OFFLOAD_VLAN_INSERT | DEV_TX_OFFLOAD_IPV4_CKSUM | DEV_TX_OFFLOAD_UDP_CKSUM | @@ -1464,5 +1464,5 @@ igb_get_tx_port_offloads_capa(struct rte_eth_dev *dev) DEV_TX_OFFLOAD_MULTI_SEGS; - return rx_offload_capa; + return tx_offload_capa; } @@ -1470,9 +1470,9 @@ uint64_t igb_get_tx_queue_offloads_capa(struct rte_eth_dev *dev) { - uint64_t rx_queue_offload_capa; + uint64_t tx_queue_offload_capa; - rx_queue_offload_capa = igb_get_tx_port_offloads_capa(dev); + tx_queue_offload_capa = igb_get_tx_port_offloads_capa(dev); - return rx_queue_offload_capa; + return tx_queue_offload_capa; } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:07.974567986 +0000 +++ 0021-net-e1000-fix-Tx-offload-capability-typos.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,13 +1,14 @@ -From daa3b0833f086c520696433e056b3c97a570370a Mon Sep 17 00:00:00 2001 +From 02f25b4214d362f19b265066c71c2b1d2204f834 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Wed, 8 Aug 2018 12:45:21 +0300 Subject: [PATCH] net/e1000: fix Tx offload capability typos +[ upstream commit daa3b0833f086c520696433e056b3c97a570370a ] + Fix rx/tx typos in igb_get_tx_port_offloads_capa and igb_get_tx_queue_offloads_capa. Fixes: e5c05e6590ea ("net/e1000: convert to new Tx offloads API") -Cc: stable@dpdk.org Signed-off-by: Yaroslav Brustinov Acked-by: Qi Zhang