From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 246DAA0613 for ; Wed, 28 Aug 2019 15:43:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1B1ED1C1FF; Wed, 28 Aug 2019 15:43:35 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id DA21D1C1FF for ; Wed, 28 Aug 2019 15:43:32 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 572F82A09C5; Wed, 28 Aug 2019 13:43:32 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B21D196AE; Wed, 28 Aug 2019 13:43:31 +0000 (UTC) From: Kevin Traynor To: Dekel Peled Cc: Ferruh Yigit , dpdk stable Date: Wed, 28 Aug 2019 14:42:11 +0100 Message-Id: <20190828134234.20547-35-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 28 Aug 2019 13:43:32 +0000 (UTC) Subject: [dpdk-stable] patch 'doc: fix ethernet addresses in flow API guide' has been queued to LTS release 18.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/04/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 are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/6c08109fb60c043c5b19ec65124c610b61e24de3 Thanks. Kevin Traynor --- >From 6c08109fb60c043c5b19ec65124c610b61e24de3 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 17 Jul 2019 22:44:18 +0300 Subject: [PATCH] doc: fix ethernet addresses in flow API guide [ upstream commit 68bb77e9688f46c4da80e74ec29d53651bc875c7 ] Ethernet address examples contain 5 bytes only. This patch changes the examples to valid 6 bytes Ethernet addresses. Fixes: 4d73b6fb9907 ("doc: add generic flow API guide") Signed-off-by: Dekel Peled Reviewed-by: Ferruh Yigit --- doc/guides/prog_guide/rte_flow.rst | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 4e9b4440b..9c6fc5e82 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -241,27 +241,27 @@ Example of an item specification matching an Ethernet header: .. table:: Ethernet item - +----------+----------+--------------------+ - | Field | Subfield | Value | - +==========+==========+====================+ - | ``spec`` | ``src`` | ``00:01:02:03:04`` | - | +----------+--------------------+ - | | ``dst`` | ``00:2a:66:00:01`` | - | +----------+--------------------+ - | | ``type`` | ``0x22aa`` | - +----------+----------+--------------------+ - | ``last`` | unspecified | - +----------+----------+--------------------+ - | ``mask`` | ``src`` | ``00:ff:ff:ff:00`` | - | +----------+--------------------+ - | | ``dst`` | ``00:00:00:00:ff`` | - | +----------+--------------------+ - | | ``type`` | ``0x0000`` | - +----------+----------+--------------------+ + +----------+----------+-----------------------+ + | Field | Subfield | Value | + +==========+==========+=======================+ + | ``spec`` | ``src`` | ``00:00:01:02:03:04`` | + | +----------+-----------------------+ + | | ``dst`` | ``00:00:2a:66:00:01`` | + | +----------+-----------------------+ + | | ``type`` | ``0x22aa`` | + +----------+----------+-----------------------+ + | ``last`` | unspecified | + +----------+----------+-----------------------+ + | ``mask`` | ``src`` | ``00:00:ff:ff:ff:00`` | + | +----------+-----------------------+ + | | ``dst`` | ``00:00:00:00:00:ff`` | + | +----------+-----------------------+ + | | ``type`` | ``0x0000`` | + +----------+----------+-----------------------+ Non-masked bits stand for any value (shown as ``?`` below), Ethernet headers with the following properties are thus matched: -- ``src``: ``??:01:02:03:??`` -- ``dst``: ``??:??:??:??:01`` +- ``src``: ``??:??:01:02:03:??`` +- ``dst``: ``??:??:??:??:??:01`` - ``type``: ``0x????`` -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:33.891799945 +0100 +++ 0036-doc-fix-ethernet-addresses-in-flow-API-guide.patch 2019-08-28 14:32:31.677956557 +0100 @@ -1 +1 @@ -From 68bb77e9688f46c4da80e74ec29d53651bc875c7 Mon Sep 17 00:00:00 2001 +From 6c08109fb60c043c5b19ec65124c610b61e24de3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 68bb77e9688f46c4da80e74ec29d53651bc875c7 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 7da446e8a..821b524b3 100644 +index 4e9b4440b..9c6fc5e82 100644 @@ -22 +23 @@ -@@ -239,27 +239,27 @@ Example of an item specification matching an Ethernet header: +@@ -241,27 +241,27 @@ Example of an item specification matching an Ethernet header: