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 8C64AA052A for ; Wed, 25 Nov 2020 10:03:06 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5D353C952; Wed, 25 Nov 2020 10:03:05 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by dpdk.org (Postfix) with ESMTP id B06E5C93E for ; Wed, 25 Nov 2020 10:03:03 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id 23so1085980wrc.8 for ; Wed, 25 Nov 2020 01:03:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pBafiIELWENLUxtOuHOE8zDJc026buv+O1B3yKN0vhk=; b=ZhRUTKKvYKBbdsM/x+gZXPqJZV9/A6hAGXCKDmhvEeJVmssLKphJs/7oGgdzDG+IhY zKy4txKIRvImsPa1DPbUbU5Ear8dPIBMmJ5dHeDjc7/s0QBxVJilTvAnDfgan7vqTUne 1x5pNk0LZ4ld53mrGoQTKOFMT6f1116Eb60h3W12BwsdCvgwA2LZTbCiDY5MD9W7nwGV OYPcKfQw5oOovoS97JGZuBV98gwEhCvB5P3gKJfen0ihMiQBho/efGsf1QXUFqyamoIu ZR/LWnrEGbMXSMfDTYk46j1xvd+QH9rxNTxQxkg29hcewSN2BpheuVTGLwJK8z2L8Esb 0EjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pBafiIELWENLUxtOuHOE8zDJc026buv+O1B3yKN0vhk=; b=GdsAyDEbqw69PCtCURYXpAsdJWXjhSAOrvqn9LWR8OOAPGswSXyWk7gM4AdvhcdKr8 RTwLIAq7g0ih19ZXVVXCAueRyhYenzpSfLoA391jbjk8RaRGJhOPwtv6EsU0W3TQOxsA s+DV0/oE001QI9K4sm3qFbBBY0uVi6ocTEQz7rur1WCetycqrRoD79j+iXrMO/sJfd2G hwOWEKZH2Dqe6BEdlULwy8/yAIRt3Nz5oEix8s8YnGnorp3iIeu1LV+7iDINSzNImzVt 0503yl0aKo6/gUQIhjOCbwnsyfnmnasR1zj392FNd1NcIPftbeGVpVkxiroMaekFyP/F eD1A== X-Gm-Message-State: AOAM532kU1dbuIUWYq7sd0iqPbZQbGxNDM3pXl3ShX1PJ6KzP8LCIsch KZqYzQrklB/DXnHFaoTAGWo= X-Google-Smtp-Source: ABdhPJxTgosNvo8q19mjKLeBhFSvZSMSRPrNZ4lGCxaPczD0L0q6lKcPcyz9aGMHR5qN9ZN4BteLNw== X-Received: by 2002:adf:dc4b:: with SMTP id m11mr2801561wrj.328.1606294982224; Wed, 25 Nov 2020 01:03:02 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u129sm2663021wme.9.2020.11.25.01.03.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 01:03:01 -0800 (PST) From: luca.boccassi@gmail.com To: Ibtisam Tariq Cc: David Marchand , dpdk stable Date: Wed, 25 Nov 2020 09:02:43 +0000 Message-Id: <20201125090258.21457-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-42-luca.boccassi@gmail.com> References: <20201117111416.1961049-42-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix rule file parameters in l3fwd-acl guide' has been queued to stable release 19.11.6 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 stable release 19.11.6 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/26/20. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/5e5d941091b1b22589abbb9f70ba787510b8507f Thanks. Luca Boccassi --- >From 5e5d941091b1b22589abbb9f70ba787510b8507f Mon Sep 17 00:00:00 2001 From: Ibtisam Tariq Date: Mon, 2 Nov 2020 11:19:15 +0000 Subject: [PATCH] doc: fix rule file parameters in l3fwd-acl guide [ upstream commit 1995c2c1b99afe89be8b532d2fde0d3619446f3c ] Add "--" and remove extra spaces in l3fwd-acl commands. Fixes: d0dff9ba445e ("doc: sample application user guide") Signed-off-by: Ibtisam Tariq Reviewed-by: David Marchand --- doc/guides/sample_app_ug/l3_forward_access_ctrl.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst index a44fbcd52c..4e58c6c612 100644 --- a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst +++ b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst @@ -236,7 +236,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME --rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] where, @@ -268,7 +268,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar + ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" --rule_ipv6="./rule_ipv6.db" --scalar In this command: @@ -290,9 +290,9 @@ In this command: | | | | | +----------+------------+-----------+-------------------------------------+ -* The --rule_ipv4 option specifies the reading of IPv4 rules sets from the ./ rule_ipv4.db file. +* The --rule_ipv4 option specifies the reading of IPv4 rules sets from the rule_ipv4.db file. -* The --rule_ipv6 option specifies the reading of IPv6 rules sets from the ./ rule_ipv6.db file. +* The --rule_ipv6 option specifies the reading of IPv6 rules sets from the rule_ipv6.db file. * The --scalar option specifies the performing of rule lookup with a scalar function. -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-24 16:50:36.604487570 +0000 +++ 0001-doc-fix-rule-file-parameters-in-l3fwd-acl-guide.patch 2020-11-24 16:50:36.529495469 +0000 @@ -1 +1 @@ -From 1995c2c1b99afe89be8b532d2fde0d3619446f3c Mon Sep 17 00:00:00 2001 +From 5e5d941091b1b22589abbb9f70ba787510b8507f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1995c2c1b99afe89be8b532d2fde0d3619446f3c ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index eee5d81850..2cf6e4556f 100644 +index a44fbcd52c..4e58c6c612 100644 @@ -25,2 +26,2 @@ -- .//examples/dpdk-l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--alg=] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] [--eth-dest=X,MM:MM:MM:MM:MM:MM] -+ .//examples/dpdk-l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME --rule_ipv6 FILENAME [--alg=] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] [--eth-dest=X,MM:MM:MM:MM:MM:MM] +- ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] ++ ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME --rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] @@ -30 +31 @@ -@@ -271,7 +271,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s +@@ -268,7 +268,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s @@ -34,2 +35,2 @@ -- .//examples/dpdk-l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --alg=scalar -+ .//examples/dpdk-l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="rule_ipv4.db" --rule_ipv6="rule_ipv6.db" --alg=scalar +- ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar ++ ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" --rule_ipv6="./rule_ipv6.db" --scalar @@ -39 +40 @@ -@@ -293,9 +293,9 @@ In this command: +@@ -290,9 +290,9 @@ In this command: @@ -49 +50 @@ - * The --alg=scalar option specifies the performing of rule lookup with a scalar function. + * The --scalar option specifies the performing of rule lookup with a scalar function.