[dpdk-stable] patch 'security: fix doxygen fields' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/21/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.

Thanks.

Luca Boccassi

---
>From 0dc35d5907227c38b34ec641fdd2223b1552741a Mon Sep 17 00:00:00 2001
From: Radu Nicolau <radu.nicolau at intel.com>
Date: Wed, 4 Sep 2019 12:03:11 +0100
Subject: [PATCH] security: fix doxygen fields

[ upstream commit 382df9dfb6a8449b595e80d7ec391f90e3420d15 ]

Replace /**< with /** for multiline doxygen comments.

Fixes: c261d1431bd8 ("security: introduce security API and framework")

Signed-off-by: Radu Nicolau <radu.nicolau at intel.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
Acked-by: Anoob Joseph <anoobj at marvell.com>
---
 lib/librte_security/rte_security.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/librte_security/rte_security.h b/lib/librte_security/rte_security.h
index 2b609cbf7a..2c8cf6ba74 100644
--- a/lib/librte_security/rte_security.h
+++ b/lib/librte_security/rte_security.h
@@ -143,14 +143,14 @@ struct rte_security_ipsec_tunnel_param {
  * IPsec Security Association option flags
  */
 struct rte_security_ipsec_sa_options {
-	/**< Extended Sequence Numbers (ESN)
+	/** Extended Sequence Numbers (ESN)
 	 *
 	 * * 1: Use extended (64 bit) sequence numbers
 	 * * 0: Use normal sequence numbers
 	 */
 	uint32_t esn : 1;
 
-	/**< UDP encapsulation
+	/** UDP encapsulation
 	 *
 	 * * 1: Do UDP encapsulation/decapsulation so that IPSEC packets can
 	 *      traverse through NAT boxes.
@@ -158,7 +158,7 @@ struct rte_security_ipsec_sa_options {
 	 */
 	uint32_t udp_encap : 1;
 
-	/**< Copy DSCP bits
+	/** Copy DSCP bits
 	 *
 	 * * 1: Copy IPv4 or IPv6 DSCP bits from inner IP header to
 	 *      the outer IP header in encapsulation, and vice versa in
@@ -167,7 +167,7 @@ struct rte_security_ipsec_sa_options {
 	 */
 	uint32_t copy_dscp : 1;
 
-	/**< Copy IPv6 Flow Label
+	/** Copy IPv6 Flow Label
 	 *
 	 * * 1: Copy IPv6 flow label from inner IPv6 header to the
 	 *      outer IPv6 header.
@@ -175,7 +175,7 @@ struct rte_security_ipsec_sa_options {
 	 */
 	uint32_t copy_flabel : 1;
 
-	/**< Copy IPv4 Don't Fragment bit
+	/** Copy IPv4 Don't Fragment bit
 	 *
 	 * * 1: Copy the DF bit from the inner IPv4 header to the outer
 	 *      IPv4 header.
@@ -183,7 +183,7 @@ struct rte_security_ipsec_sa_options {
 	 */
 	uint32_t copy_df : 1;
 
-	/**< Decrement inner packet Time To Live (TTL) field
+	/** Decrement inner packet Time To Live (TTL) field
 	 *
 	 * * 1: In tunnel mode, decrement inner packet IPv4 TTL or
 	 *      IPv6 Hop Limit after tunnel decapsulation, or before tunnel
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:27.086213241 +0000
+++ 0019-security-fix-doxygen-fields.patch	2019-12-19 14:32:25.457284976 +0000
@@ -1,25 +1,26 @@
-From 382df9dfb6a8449b595e80d7ec391f90e3420d15 Mon Sep 17 00:00:00 2001
+From 0dc35d5907227c38b34ec641fdd2223b1552741a Mon Sep 17 00:00:00 2001
 From: Radu Nicolau <radu.nicolau at intel.com>
 Date: Wed, 4 Sep 2019 12:03:11 +0100
 Subject: [PATCH] security: fix doxygen fields
 
+[ upstream commit 382df9dfb6a8449b595e80d7ec391f90e3420d15 ]
+
 Replace /**< with /** for multiline doxygen comments.
 
 Fixes: c261d1431bd8 ("security: introduce security API and framework")
-Cc: stable at dpdk.org
 
 Signed-off-by: Radu Nicolau <radu.nicolau at intel.com>
 Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
 Acked-by: Anoob Joseph <anoobj at marvell.com>
 ---
- lib/librte_security/rte_security.h | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
+ lib/librte_security/rte_security.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/lib/librte_security/rte_security.h b/lib/librte_security/rte_security.h
-index 242c908d1c..2d064f4d04 100644
+index 2b609cbf7a..2c8cf6ba74 100644
 --- a/lib/librte_security/rte_security.h
 +++ b/lib/librte_security/rte_security.h
-@@ -115,14 +115,14 @@ struct rte_security_ipsec_tunnel_param {
+@@ -143,14 +143,14 @@ struct rte_security_ipsec_tunnel_param {
   * IPsec Security Association option flags
   */
  struct rte_security_ipsec_sa_options {
@@ -36,7 +37,7 @@
  	 *
  	 * * 1: Do UDP encapsulation/decapsulation so that IPSEC packets can
  	 *      traverse through NAT boxes.
-@@ -130,7 +130,7 @@ struct rte_security_ipsec_sa_options {
+@@ -158,7 +158,7 @@ struct rte_security_ipsec_sa_options {
  	 */
  	uint32_t udp_encap : 1;
  
@@ -45,7 +46,7 @@
  	 *
  	 * * 1: Copy IPv4 or IPv6 DSCP bits from inner IP header to
  	 *      the outer IP header in encapsulation, and vice versa in
-@@ -139,7 +139,7 @@ struct rte_security_ipsec_sa_options {
+@@ -167,7 +167,7 @@ struct rte_security_ipsec_sa_options {
  	 */
  	uint32_t copy_dscp : 1;
  
@@ -54,7 +55,7 @@
  	 *
  	 * * 1: Copy IPv6 flow label from inner IPv6 header to the
  	 *      outer IPv6 header.
-@@ -147,7 +147,7 @@ struct rte_security_ipsec_sa_options {
+@@ -175,7 +175,7 @@ struct rte_security_ipsec_sa_options {
  	 */
  	uint32_t copy_flabel : 1;
  
@@ -63,7 +64,7 @@
  	 *
  	 * * 1: Copy the DF bit from the inner IPv4 header to the outer
  	 *      IPv4 header.
-@@ -155,7 +155,7 @@ struct rte_security_ipsec_sa_options {
+@@ -183,7 +183,7 @@ struct rte_security_ipsec_sa_options {
  	 */
  	uint32_t copy_df : 1;
  
@@ -72,15 +73,6 @@
  	 *
  	 * * 1: In tunnel mode, decrement inner packet IPv4 TTL or
  	 *      IPv6 Hop Limit after tunnel decapsulation, or before tunnel
-@@ -164,7 +164,7 @@ struct rte_security_ipsec_sa_options {
- 	 */
- 	uint32_t dec_ttl : 1;
- 
--	/**< Explicit Congestion Notification (ECN)
-+	/** Explicit Congestion Notification (ECN)
- 	 *
- 	 * * 1: In tunnel mode, enable outer header ECN Field copied from
- 	 *      inner header in tunnel encapsulation, or inner header ECN
 -- 
 2.20.1