[dpdk-stable] patch 'net/mvpp2: fix comments and error messages' has been queued to stable release 18.08.1

[Kevin Traynor]

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 at 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 at marvell.com>
Reviewed-by: Liron Himi <lironh at 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 at 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 at dpdk.org
 
 Signed-off-by: Natalie Samsonov <nsamsono at marvell.com>
 Reviewed-by: Liron Himi <lironh at marvell.com>