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 2BAC3A04C3 for ; Fri, 22 Nov 2019 15:42:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1EC831B103; Fri, 22 Nov 2019 15:42:46 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 0ED8B1BE82 for ; Fri, 22 Nov 2019 15:42:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574433764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RVzPlphw7Ri8ss7S+8fyRlj8/RsZ1AJqgs9tDYYY354=; b=C4X2RgY7Mdk9XW2dvWSoPfXJia4JtCR2JJWlQmbnOXUTvzYILGwkiik+EkA+8mOcssNKIg wy6uKbk5dPXFaaanTMS8HuBCtkZF5IDmKTx21TT05iQorwLCslNSbHt6Dvd9KHlNJ3Dift fLssPO4AuvrmxVz+KSjay0HlArchcGU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-110-JepingXTNhmmLSxYn5TkJg-1; Fri, 22 Nov 2019 09:42:41 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C0D0DBAE; Fri, 22 Nov 2019 14:42:40 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 155778516; Fri, 22 Nov 2019 14:42:38 +0000 (UTC) From: Kevin Traynor To: Radu Nicolau Cc: Akhil Goyal , Anoob Joseph , dpdk stable Date: Fri, 22 Nov 2019 14:41:15 +0000 Message-Id: <20191122144131.21231-29-ktraynor@redhat.com> In-Reply-To: <20191122144131.21231-1-ktraynor@redhat.com> References: <20191122144131.21231-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: JepingXTNhmmLSxYn5TkJg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'security: fix doxygen fields' has been queued to LTS release 18.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 LTS release 18.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/29/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 rebasi= ng (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/6e8289a7d814b23aee= 84972279b16978d8b524db Thanks. Kevin. --- >From 6e8289a7d814b23aee84972279b16978d8b524db Mon Sep 17 00:00:00 2001 From: Radu Nicolau 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 Acked-by: Akhil Goyal Acked-by: Anoob Joseph --- 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_s= ecurity.h index 7e6ced4e4..ad7898c72 100644 --- a/lib/librte_security/rte_security.h +++ b/lib/librte_security/rte_security.h @@ -116,5 +116,5 @@ struct rte_security_ipsec_tunnel_param { */ struct rte_security_ipsec_sa_options { -=09/**< Extended Sequence Numbers (ESN) +=09/** Extended Sequence Numbers (ESN) =09 * =09 * * 1: Use extended (64 bit) sequence numbers @@ -123,5 +123,5 @@ struct rte_security_ipsec_sa_options { =09uint32_t esn : 1; =20 -=09/**< UDP encapsulation +=09/** UDP encapsulation =09 * =09 * * 1: Do UDP encapsulation/decapsulation so that IPSEC packets can @@ -131,5 +131,5 @@ struct rte_security_ipsec_sa_options { =09uint32_t udp_encap : 1; =20 -=09/**< Copy DSCP bits +=09/** Copy DSCP bits =09 * =09 * * 1: Copy IPv4 or IPv6 DSCP bits from inner IP header to @@ -140,5 +140,5 @@ struct rte_security_ipsec_sa_options { =09uint32_t copy_dscp : 1; =20 -=09/**< Copy IPv6 Flow Label +=09/** Copy IPv6 Flow Label =09 * =09 * * 1: Copy IPv6 flow label from inner IPv6 header to the @@ -148,5 +148,5 @@ struct rte_security_ipsec_sa_options { =09uint32_t copy_flabel : 1; =20 -=09/**< Copy IPv4 Don't Fragment bit +=09/** Copy IPv4 Don't Fragment bit =09 * =09 * * 1: Copy the DF bit from the inner IPv4 header to the outer @@ -156,5 +156,5 @@ struct rte_security_ipsec_sa_options { =09uint32_t copy_df : 1; =20 -=09/**< Decrement inner packet Time To Live (TTL) field +=09/** Decrement inner packet Time To Live (TTL) field =09 * =09 * * 1: In tunnel mode, decrement inner packet IPv4 TTL or --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-11-22 14:36:56.769642871 +0000 +++ 0029-security-fix-doxygen-fields.patch=092019-11-22 14:36:55.198149265 = +0000 @@ -1 +1 @@ -From 382df9dfb6a8449b595e80d7ec391f90e3420d15 Mon Sep 17 00:00:00 2001 +From 6e8289a7d814b23aee84972279b16978d8b524db Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 382df9dfb6a8449b595e80d7ec391f90e3420d15 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -15,2 +16,2 @@ - 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(-) @@ -19 +20 @@ -index 242c908d1..2d064f4d0 100644 +index 7e6ced4e4..ad7898c72 100644 @@ -64,7 +64,0 @@ -@@ -165,5 +165,5 @@ struct rte_security_ipsec_sa_options { - =09uint32_t dec_ttl : 1; -=20 --=09/**< Explicit Congestion Notification (ECN) -+=09/** Explicit Congestion Notification (ECN) - =09 * - =09 * * 1: In tunnel mode, enable outer header ECN Field copied from