patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Natalie Samsonov <nsamsono@marvell.com>
Cc: Liron Himi <lironh@marvell.com>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/mvpp2: fix comments and error messages' has been queued to stable release 18.08.1
Date: Tue, 20 Nov 2018 19:12:06 +0000	[thread overview]
Message-ID: <20181120191252.30277-16-ktraynor@redhat.com> (raw)
In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com>

Hi,

FYI, your patch has been queued to stable release 18.08.1

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/23/18. 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.

Kevin Traynor

---
>From 2f6a186d75f7d038728a9c311eb8cd40561d10ea Mon Sep 17 00:00:00 2001
From: Natalie Samsonov <nsamsono@marvell.com>
Date: Fri, 24 Aug 2018 20:30:01 +0200
Subject: [PATCH] net/mvpp2: fix comments and error messages

[ upstream commit 63e0f0170405385551d52d983ddb8c5227178f51 ]

Fix comments and error messages.

Fixes: 7235341d7517 ("net/mrvl: support classifier")

Signed-off-by: Natalie Samsonov <nsamsono@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>
---
 drivers/net/mvpp2/mrvl_flow.c | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/drivers/net/mvpp2/mrvl_flow.c b/drivers/net/mvpp2/mrvl_flow.c
index ecc34192a..13295e653 100644
--- a/drivers/net/mvpp2/mrvl_flow.c
+++ b/drivers/net/mvpp2/mrvl_flow.c
@@ -395,5 +395,6 @@ mrvl_parse_init(const struct rte_flow_item *item,
  * @param spec Pointer to the specific flow item.
  * @param mask Pointer to the specific flow item's mask.
- * @param mask Pointer to the flow.
+ * @param parse_dst Parse either destination or source mac address.
+ * @param flow Pointer to the flow.
  * @return 0 in case of success, negative error value otherwise.
  */
@@ -614,4 +615,5 @@ mrvl_parse_ip4_dscp(const struct rte_flow_item_ipv4 *spec,
  * @param spec Pointer to the specific flow item.
  * @param mask Pointer to the specific flow item's mask.
+ * @param parse_dst Parse either destination or source ip address.
  * @param flow Pointer to the flow.
  * @return 0 in case of success, negative error value otherwise.
@@ -727,4 +729,5 @@ mrvl_parse_ip4_proto(const struct rte_flow_item_ipv4 *spec,
  * @param spec Pointer to the specific flow item.
  * @param mask Pointer to the specific flow item's mask.
+ * @param parse_dst Parse either destination or source ipv6 address.
  * @param flow Pointer to the flow.
  * @return 0 in case of success, negative error value otherwise.
@@ -875,4 +878,5 @@ mrvl_parse_ip6_next_hdr(const struct rte_flow_item_ipv6 *spec,
  * @param spec Pointer to the specific flow item.
  * @param mask Pointer to the specific flow item's mask.
+ * @param parse_dst Parse either destination or source port.
  * @param flow Pointer to the flow.
  * @return 0 in case of success, negative error value otherwise.
@@ -950,4 +954,5 @@ mrvl_parse_tcp_dport(const struct rte_flow_item_tcp *spec,
  * @param spec Pointer to the specific flow item.
  * @param mask Pointer to the specific flow item's mask.
+ * @param parse_dst Parse either destination or source port.
  * @param flow Pointer to the flow.
  * @return 0 in case of success, negative error value otherwise.
@@ -1023,5 +1028,4 @@ mrvl_parse_udp_dport(const struct rte_flow_item_udp *spec,
  * @param flow Pointer to the flow.
  * @param error Pointer to the flow error.
- * @param fields Pointer to the parsed parsed fields enum.
  * @returns 0 on success, negative value otherwise.
  */
@@ -1074,5 +1078,4 @@ out:
  * @param flow Pointer to the flow.
  * @param error Pointer to the flow error.
- * @param fields Pointer to the parsed parsed fields enum.
  * @returns 0 on success, negative value otherwise.
  */
@@ -1140,5 +1143,4 @@ out:
  * @param flow Pointer to the flow.
  * @param error Pointer to the flow error.
- * @param fields Pointer to the parsed parsed fields enum.
  * @returns 0 on success, negative value otherwise.
  */
@@ -1206,5 +1208,4 @@ out:
  * @param flow Pointer to the flow.
  * @param error Pointer to the flow error.
- * @param fields Pointer to the parsed parsed fields enum.
  * @returns 0 on success, negative value otherwise.
  */
@@ -1277,5 +1278,4 @@ out:
  * @param flow Pointer to the flow.
  * @param error Pointer to the flow error.
- * @param fields Pointer to the parsed parsed fields enum.
  * @returns 0 on success, negative value otherwise.
  */
@@ -1333,5 +1333,4 @@ out:
  * @param flow Pointer to the flow.
  * @param error Pointer to the flow error.
- * @param fields Pointer to the parsed parsed fields enum.
  * @returns 0 on success, negative value otherwise.
  */
@@ -1982,4 +1981,5 @@ mrvl_parse_pattern_ip6_tcp(const struct rte_flow_item pattern[],
  * @param flow Pointer to the flow.
  * @param error Pointer to the flow error.
+ * @param ip6 1 to parse ip6 item, 0 to parse ip4 item.
  * @returns 0 in case of success, negative value otherwise.
  */
@@ -2351,4 +2351,10 @@ mrvl_flow_parse(struct mrvl_priv *priv, const struct rte_flow_attr *attr,
 }
 
+/**
+ * Get engine type for the given flow.
+ *
+ * @param field Pointer to the flow.
+ * @returns The type of the engine.
+ */
 static inline enum pp2_cls_tbl_type
 mrvl_engine_type(const struct rte_flow *flow)
@@ -2370,4 +2376,11 @@ mrvl_engine_type(const struct rte_flow *flow)
 }
 
+/**
+ * Create classifier table.
+ *
+ * @param dev Pointer to the device.
+ * @param flow Pointer to the very first flow.
+ * @returns 0 in case of success, negative value otherwise.
+ */
 static int
 mrvl_create_cls_table(struct rte_eth_dev *dev, struct rte_flow *first_flow)
@@ -2656,5 +2669,5 @@ mrvl_flow_remove(struct mrvl_priv *priv, struct rte_flow *flow,
  * DPDK flow destroy callback called when flow is to be removed.
  *
- * @param priv Pointer to the port's private data.
+ * @param dev Pointer to the device.
  * @param flow Pointer to the flow.
  * @param error Pointer to the flow error.
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-20 17:53:07.847373770 +0000
+++ 0016-net-mvpp2-fix-comments-and-error-messages.patch	2018-11-20 17:53:07.000000000 +0000
@@ -1,12 +1,13 @@
-From 63e0f0170405385551d52d983ddb8c5227178f51 Mon Sep 17 00:00:00 2001
+From 2f6a186d75f7d038728a9c311eb8cd40561d10ea Mon Sep 17 00:00:00 2001
 From: Natalie Samsonov <nsamsono@marvell.com>
 Date: Fri, 24 Aug 2018 20:30:01 +0200
 Subject: [PATCH] net/mvpp2: fix comments and error messages
 
+[ upstream commit 63e0f0170405385551d52d983ddb8c5227178f51 ]
+
 Fix comments and error messages.
 
 Fixes: 7235341d7517 ("net/mrvl: support classifier")
-Cc: stable@dpdk.org
 
 Signed-off-by: Natalie Samsonov <nsamsono@marvell.com>
 Reviewed-by: Liron Himi <lironh@marvell.com>

  parent reply	other threads:[~2018-11-20 19:14 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-20 19:11 [dpdk-stable] patch 'devtools: relax rule for identifying symbol section' " Kevin Traynor
2018-11-20 19:11 ` [dpdk-stable] patch 'mk: disable OcteonTx for buggy compilers only on arm64' " Kevin Traynor
2018-11-20 19:11 ` [dpdk-stable] patch 'build: enable ARM NEON flag when __aarch64__ defined' " Kevin Traynor
2018-11-20 19:11 ` [dpdk-stable] patch 'malloc: fix potential null pointer dereference' " Kevin Traynor
2018-11-20 19:11 ` [dpdk-stable] patch 'bus/vdev: fix error log on secondary device scan' " Kevin Traynor
2018-11-20 19:11 ` [dpdk-stable] patch 'acl: forbid rule with priority zero' " Kevin Traynor
2018-11-20 19:11 ` [dpdk-stable] patch 'net/bonding: support matching QinQ ethertype' " Kevin Traynor
2018-11-20 19:11 ` [dpdk-stable] patch 'net/netvsc: fix chimney buffer size error handling' " Kevin Traynor
2018-11-20 19:11 ` [dpdk-stable] patch 'net/netvsc: resize event buffer as needed' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/octeontx: fix packet corruption on Tx' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'doc: fix style and syntax in flow API guide' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/mlx5: fix artificial L4 limitation on switch flow rules' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/mlx5: disable ConnectX-4 Lx Multi Packet Send by default' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/mlx5: fix RSS flow action hash type selection' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/mvpp2: fix array initialization' " Kevin Traynor
2018-11-20 19:12 ` Kevin Traynor [this message]
2018-11-20 19:12 ` [dpdk-stable] patch 'ethdev: fix MAC changes when live change not supported' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/nfp: fix live MAC changes " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'ethdev: fix port ownership logs' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/bonding: fix buffer corruption in packets' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/e1000: fix Tx offload capability typos' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/cxgbe: fix memory access when parsing flow match items' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/ixgbe: do not return internal code' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/mlx5: fix interrupt completion queue index wrapping' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'doc: fix wrong usage of bind command' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'examples/vhost: remove unnecessary constant' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'vhost: fix zmbufs array leak after NUMA realloc' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/virtio-user: check negotiated features before set' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'vhost: fix vhost interrupt support' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'vhost-user: drop connection on message handling failures' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'vhost: fix return value on enqueue path' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'ethdev: fix missing names in Tx offload name array' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/bonding: use evenly distributed default RSS RETA' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/bonding: do not ignore RSS key on device config' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'crypto/qat: fix typo' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'app/bbdev: fix inputs mbuf creation' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'compat: fix symbol version support with meson' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'eal: include missing hypervisor files in " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'raw/ifpga: use -Wno-error=format-security for " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/i40e: " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'igb_uio: install module when building with " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'build: create relative symlinks for PMDs in libdir' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'pdump: remove dependency on libpthread' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'fbarray: fix detach in --no-shconf mode' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'eal: do not allow legacy mode with --in-memory " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'app/testpmd: optimize mbuf pool allocation' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'config: remove unused parameter' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/e1000: fix queue number in RSS configuration' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/ifc: do not notify before HW ready' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/nfp: fix mbuf flags with checksum good' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/qede/base: fix to handle stag update event' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/qede: fix ethernet type in HW registers' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/qede/base: fix logic for sfp get/set' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/qede: fix flow director for IPv6 filter' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/qede: fix Rx buffer size calculation' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/qede/base: fix MFW FLR flow' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/virtio-user: fix deadlock in memory events callback' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/virtio-user: fix memory hotplug support in vhost-kernel' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/failsafe: fix crash on slave queue release' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net/failsafe: add checks for deferred queue setup' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'app/testpmd: fix missing jump action in flow action' " Kevin Traynor
2018-11-20 19:12 ` [dpdk-stable] patch 'net: fix Intel prepare function for IP checksum offload' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181120191252.30277-16-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=lironh@marvell.com \
    --cc=nsamsono@marvell.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).