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 F2613A05D3 for ; Thu, 25 Apr 2019 17:42:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E715F1B60B; Thu, 25 Apr 2019 17:42:16 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E466D1B60B for ; Thu, 25 Apr 2019 17:42:15 +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 53A65308BBC2; Thu, 25 Apr 2019 15:42:15 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 461F95DE66; Thu, 25 Apr 2019 15:42:14 +0000 (UTC) From: Kevin Traynor To: Dekel Peled Cc: Bernard Iremonger , dpdk stable Date: Thu, 25 Apr 2019 16:40:35 +0100 Message-Id: <20190425154037.28778-60-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-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.47]); Thu, 25 Apr 2019 15:42:15 +0000 (UTC) Subject: [dpdk-stable] patch 'doc: fix typos in testpmd user guide' 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/01/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 the 18.11 branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 7230fafb7052bcb604d1be07b6400e32c01c45c1 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Sun, 31 Mar 2019 13:20:55 +0300 Subject: [PATCH] doc: fix typos in testpmd user guide [ upstream commit 205d9d3cf8a8d6fa7a79b399315c61df859dd01d ] Correct typing mistakes in several places. 1) "Those command will" ==> "These commands will" 2) icmp6_nd_opt_sla_eth ==> icmp6_nd_opt_tla_eth (change 's' to 't' for 'target' where applicable) Fixes: 1960be7d32f8 ("app/testpmd: add VXLAN encap/decap") Signed-off-by: Dekel Peled Acked-by: Bernard Iremonger --- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 98be85219..d4e3fd8a5 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -1584,5 +1584,5 @@ Configure the outer layer to encapsulate a packet inside a VXLAN tunnel:: eth-src (eth-src) eth-dst (eth-dst) -Those command will set an internal configuration inside testpmd, any following +These commands will set an internal configuration inside testpmd, any following flow rule using the action vxlan_encap will use the last configuration set. To have a different encapsulation header, one of those commands must be called @@ -1599,5 +1599,5 @@ Configure the outer layer to encapsulate a packet inside a NVGRE tunnel:: ip-dst (ip-dst) vlan-tci (vlan-tci) eth-src (eth-src) eth-dst (eth-dst) -Those command will set an internal configuration inside testpmd, any following +These commands will set an internal configuration inside testpmd, any following flow rule using the action nvgre_encap will use the last configuration set. To have a different encapsulation header, one of those commands must be called @@ -1642,5 +1642,5 @@ Configure the outer layer to encapsulate a packet inside a MPLSoGRE tunnel:: eth-src (eth-src) eth-dst (eth-dst) -Those command will set an internal configuration inside testpmd, any following +These commands will set an internal configuration inside testpmd, any following flow rule using the action mplsogre_encap will use the last configuration set. To have a different encapsulation header, one of those commands must be called @@ -1655,5 +1655,5 @@ Configure the outer layer to decapsulate MPLSoGRE packet:: set mplsogre_decap-with-vlan ip-version (ipv4|ipv6) -Those command will set an internal configuration inside testpmd, any following +These commands will set an internal configuration inside testpmd, any following flow rule using the action mplsogre_decap will use the last configuration set. To have a different decapsulation header, one of those commands must be called @@ -1672,5 +1672,5 @@ Configure the outer layer to encapsulate a packet inside a MPLSoUDP tunnel:: vlan-tci (vlan-tci) eth-src (eth-src) eth-dst (eth-dst) -Those command will set an internal configuration inside testpmd, any following +These commands will set an internal configuration inside testpmd, any following flow rule using the action mplsoudp_encap will use the last configuration set. To have a different encapsulation header, one of those commands must be called @@ -1685,5 +1685,5 @@ Configure the outer layer to decapsulate MPLSoUDP packet:: set mplsoudp_decap-with-vlan ip-version (ipv4|ipv6) -Those command will set an internal configuration inside testpmd, any following +These commands will set an internal configuration inside testpmd, any following flow rule using the action mplsoudp_decap will use the last configuration set. To have a different decapsulation header, one of those commands must be called @@ -3706,5 +3706,5 @@ This section lists supported pattern items and their attributes, if any. - ``sla {MAC-48}``: source Ethernet LLA. -- ``icmp6_nd_opt_sla_eth``: match ICMPv6 neighbor discovery target Ethernet +- ``icmp6_nd_opt_tla_eth``: match ICMPv6 neighbor discovery target Ethernet link-layer address option. -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-25 16:37:49.329358830 +0100 +++ 0060-doc-fix-typos-in-testpmd-user-guide.patch 2019-04-25 16:37:46.784294057 +0100 @@ -1 +1 @@ -From 205d9d3cf8a8d6fa7a79b399315c61df859dd01d Mon Sep 17 00:00:00 2001 +From 7230fafb7052bcb604d1be07b6400e32c01c45c1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 205d9d3cf8a8d6fa7a79b399315c61df859dd01d ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 06c8b2ac0..bcf1449a2 100644 +index 98be85219..d4e3fd8a5 100644 @@ -24,2 +25,2 @@ -@@ -1624,5 +1624,5 @@ Configure the outer layer to encapsulate a packet inside a VXLAN tunnel:: - ip-dst (ip-dst) eth-src (eth-src) eth-dst (eth-dst) +@@ -1584,5 +1584,5 @@ Configure the outer layer to encapsulate a packet inside a VXLAN tunnel:: + eth-src (eth-src) eth-dst (eth-dst) @@ -31 +32 @@ -@@ -1639,5 +1639,5 @@ Configure the outer layer to encapsulate a packet inside a NVGRE tunnel:: +@@ -1599,5 +1599,5 @@ Configure the outer layer to encapsulate a packet inside a NVGRE tunnel:: @@ -38 +39 @@ -@@ -1682,5 +1682,5 @@ Configure the outer layer to encapsulate a packet inside a MPLSoGRE tunnel:: +@@ -1642,5 +1642,5 @@ Configure the outer layer to encapsulate a packet inside a MPLSoGRE tunnel:: @@ -45 +46 @@ -@@ -1695,5 +1695,5 @@ Configure the outer layer to decapsulate MPLSoGRE packet:: +@@ -1655,5 +1655,5 @@ Configure the outer layer to decapsulate MPLSoGRE packet:: @@ -52 +53 @@ -@@ -1712,5 +1712,5 @@ Configure the outer layer to encapsulate a packet inside a MPLSoUDP tunnel:: +@@ -1672,5 +1672,5 @@ Configure the outer layer to encapsulate a packet inside a MPLSoUDP tunnel:: @@ -59 +60 @@ -@@ -1725,5 +1725,5 @@ Configure the outer layer to decapsulate MPLSoUDP packet:: +@@ -1685,5 +1685,5 @@ Configure the outer layer to decapsulate MPLSoUDP packet:: @@ -66 +67 @@ -@@ -3746,5 +3746,5 @@ This section lists supported pattern items and their attributes, if any. +@@ -3706,5 +3706,5 @@ This section lists supported pattern items and their attributes, if any.