From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 886911B949 for ; Fri, 11 Jan 2019 11:31:58 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 11 Jan 2019 12:31:56 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x0BAVjcU018586; Fri, 11 Jan 2019 12:31:55 +0200 From: Yongseok Koh To: Hyong Youb Kim Cc: John Daley , Ferruh Yigit , dpdk stable Date: Fri, 11 Jan 2019 02:31:29 -0800 Message-Id: <20190111103142.21088-6-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190111103142.21088-1-yskoh@mellanox.com> References: <20190111103142.21088-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'app/testpmd: check Rx VLAN offload flag to print VLAN TCI' has been queued to LTS release 17.11.5 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, 11 Jan 2019 10:31:58 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/13/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. 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. Yongseok --- >>From 434d9ec2786a878bc86c91466b83b22b3c7383aa Mon Sep 17 00:00:00 2001 From: Hyong Youb Kim Date: Tue, 25 Sep 2018 20:06:17 -0700 Subject: [PATCH] app/testpmd: check Rx VLAN offload flag to print VLAN TCI [ upstream commit 597177163b851ae365f5c0113c448fae83370f99 ] Since the following commit, PKT_RX_VLAN indicates the presence of mbuf's vlan_tci, not PKT_RX_VLAN_STRIPPED. Fixes: 380a7aab1ae2 ("mbuf: rename deprecated VLAN flags") Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley Reviewed-by: Ferruh Yigit --- app/test-pmd/rxonly.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c index fb6e8e33f..ea2a956c7 100644 --- a/app/test-pmd/rxonly.c +++ b/app/test-pmd/rxonly.c @@ -159,7 +159,7 @@ pkt_burst_receive(struct fwd_stream *fs) } if (ol_flags & PKT_RX_TIMESTAMP) printf(" - timestamp %"PRIu64" ", mb->timestamp); - if (ol_flags & PKT_RX_VLAN_STRIPPED) + if (ol_flags & PKT_RX_VLAN) printf(" - VLAN tci=0x%x", mb->vlan_tci); if (ol_flags & PKT_RX_QINQ_STRIPPED) printf(" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x", -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-11 02:29:11.217100439 -0800 +++ 0006-app-testpmd-check-Rx-VLAN-offload-flag-to-print-VLAN.patch 2019-01-11 02:29:10.704975000 -0800 @@ -1,13 +1,14 @@ -From 597177163b851ae365f5c0113c448fae83370f99 Mon Sep 17 00:00:00 2001 +From 434d9ec2786a878bc86c91466b83b22b3c7383aa Mon Sep 17 00:00:00 2001 From: Hyong Youb Kim Date: Tue, 25 Sep 2018 20:06:17 -0700 Subject: [PATCH] app/testpmd: check Rx VLAN offload flag to print VLAN TCI +[ upstream commit 597177163b851ae365f5c0113c448fae83370f99 ] + Since the following commit, PKT_RX_VLAN indicates the presence of mbuf's vlan_tci, not PKT_RX_VLAN_STRIPPED. Fixes: 380a7aab1ae2 ("mbuf: rename deprecated VLAN flags") -Cc: stable@dpdk.org Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley @@ -17,10 +18,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c -index a93d80612..e8d226624 100644 +index fb6e8e33f..ea2a956c7 100644 --- a/app/test-pmd/rxonly.c +++ b/app/test-pmd/rxonly.c -@@ -130,7 +130,7 @@ pkt_burst_receive(struct fwd_stream *fs) +@@ -159,7 +159,7 @@ pkt_burst_receive(struct fwd_stream *fs) } if (ol_flags & PKT_RX_TIMESTAMP) printf(" - timestamp %"PRIu64" ", mb->timestamp);