From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 3E5DFA0679 for ; Tue, 30 Apr 2019 19:02:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 311A558CB; Tue, 30 Apr 2019 19:02:00 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 4A5535F16 for ; Tue, 30 Apr 2019 19:01:58 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A9A8581DF0; Tue, 30 Apr 2019 17:01:57 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-211.ams2.redhat.com [10.36.117.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id 548966D0A2; Tue, 30 Apr 2019 17:01:56 +0000 (UTC) From: Kevin Traynor To: Nithin Dabilpuram Cc: Bernard Iremonger , Ferruh Yigit , dpdk stable Date: Tue, 30 Apr 2019 18:01:03 +0100 Message-Id: <20190430170133.2331-8-ktraynor@redhat.com> In-Reply-To: <20190430170133.2331-1-ktraynor@redhat.com> References: <20190430170133.2331-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 30 Apr 2019 17:01:57 +0000 (UTC) Subject: [dpdk-stable] patch 'app/testpmd: fix Tx VLAN and QinQ dependency' has been queued to LTS release 18.11.2 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.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/07/19. 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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches can be viewed on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 715a10099da8c410e5b3a9156818324d6d158dbb Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Fri, 5 Apr 2019 07:36:21 +0000 Subject: [PATCH] app/testpmd: fix Tx VLAN and QinQ dependency [ upstream commit 368ba98aead8fc1c84e65cbf43338b4bcc856364 ] Tx VLAN & QinQ insert enable need not depend on Rx VLAN offload ETH_VLAN_EXTEND_OFFLOAD. For Tx VLAN insert enable, error check is now to see if QinQ was enabled but only single VLAN id is set. Fixes: 6a34f91690d0 ("app/testpmd: fix error message when setting Tx VLAN") Signed-off-by: Nithin Dabilpuram Acked-by: Bernard Iremonger Reviewed-by: Ferruh Yigit --- app/test-pmd/config.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index b9e5dd923..5397acbd1 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2956,5 +2956,4 @@ void tx_vlan_set(portid_t port_id, uint16_t vlan_id) { - int vlan_offload; struct rte_eth_dev_info dev_info; @@ -2964,6 +2963,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id) return; - vlan_offload = rte_eth_dev_get_vlan_offload(port_id); - if (vlan_offload & ETH_VLAN_EXTEND_OFFLOAD) { + if (ports[port_id].dev_conf.txmode.offloads & + DEV_TX_OFFLOAD_QINQ_INSERT) { printf("Error, as QinQ has been enabled.\n"); return; @@ -2984,5 +2983,4 @@ void tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer) { - int vlan_offload; struct rte_eth_dev_info dev_info; @@ -2994,9 +2992,4 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer) return; - vlan_offload = rte_eth_dev_get_vlan_offload(port_id); - if (!(vlan_offload & ETH_VLAN_EXTEND_OFFLOAD)) { - printf("Error, as QinQ hasn't been enabled.\n"); - return; - } rte_eth_dev_info_get(port_id, &dev_info); if ((dev_info.tx_offload_capa & DEV_TX_OFFLOAD_QINQ_INSERT) == 0) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-30 17:58:14.198035581 +0100 +++ 0008-app-testpmd-fix-Tx-VLAN-and-QinQ-dependency.patch 2019-04-30 17:58:13.760140742 +0100 @@ -1 +1 @@ -From 368ba98aead8fc1c84e65cbf43338b4bcc856364 Mon Sep 17 00:00:00 2001 +From 715a10099da8c410e5b3a9156818324d6d158dbb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 368ba98aead8fc1c84e65cbf43338b4bcc856364 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index cadcb512f..010e26d4c 100644 +index b9e5dd923..5397acbd1 100644 @@ -25 +26 @@ -@@ -2963,5 +2963,4 @@ void +@@ -2956,5 +2956,4 @@ void @@ -31 +32 @@ -@@ -2971,6 +2970,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id) +@@ -2964,6 +2963,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id) @@ -40 +41 @@ -@@ -2991,5 +2990,4 @@ void +@@ -2984,5 +2983,4 @@ void @@ -46 +47 @@ -@@ -3001,9 +2999,4 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer) +@@ -2994,9 +2992,4 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)