From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 43ABBA057F for ; Tue, 28 Jun 2022 17:19:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3EBEF40042; Tue, 28 Jun 2022 17:19:58 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id F154040042 for ; Tue, 28 Jun 2022 17:19:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656429595; 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=2yw6C1d8kU+LQoDl9hixX7OGHziBzVOF18So3r9jXKA=; b=N8UUuGM2vLVrca63nYGU/j/acBcVp/3CUnSv1O9l4JsXeOWKZAm0Zp55/L3aSKnMjMohTS s53koImguVAVvkw+ddkQlZD9OBmyYFquyPDe2hl588aniKjJi2DanNO4BvyBiF5Mq+wuKi eeLUtJv6OBhItLJX4XKdSEC9pnxGxi8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-551-YnMJewuzNx-WLpnfjbvZvA-1; Tue, 28 Jun 2022 11:19:50 -0400 X-MC-Unique: YnMJewuzNx-WLpnfjbvZvA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B1A32958C2A; Tue, 28 Jun 2022 15:19:49 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFC0A1415108; Tue, 28 Jun 2022 15:19:48 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Vladimir Medvedkin , dpdk stable Subject: patch 'rib: fix references for IPv6 implementation' has been queued to stable release 21.11.2 Date: Tue, 28 Jun 2022 16:19:17 +0100 Message-Id: <20220628151938.2278711-5-ktraynor@redhat.com> In-Reply-To: <20220628151938.2278711-1-ktraynor@redhat.com> References: <20220628151938.2278711-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/30/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/7181c621fb93c2080b7c1423b318424632e185ff Thanks. Kevin --- >From 7181c621fb93c2080b7c1423b318424632e185ff Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 22 Jun 2022 13:41:28 -0700 Subject: [PATCH] rib: fix references for IPv6 implementation [ upstream commit 26f5a0d5a6bb3d839d0361aac4ff46b6358bd2a7 ] The comments in rte_rib6 were cut-and-pasted from rte_rib and because of that some references to rte_rib_node were not updated. Signed-off-by: Stephen Hemminger Acked-by: Vladimir Medvedkin --- lib/rib/rte_rib6.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/rib/rte_rib6.h b/lib/rib/rte_rib6.h index 6f532265c6..d52b0b05cc 100644 --- a/lib/rib/rte_rib6.h +++ b/lib/rib/rte_rib6.h @@ -41,10 +41,10 @@ struct rte_rib6_node; struct rte_rib6_conf { /** - * Size of extension block inside rte_rib_node. + * Size of extension block inside rte_rib6_node. * This space could be used to store additional user * defined data. */ size_t ext_sz; - /* size of rte_rib_node's pool */ + /* size of rte_rib6_node's pool */ int max_nodes; }; @@ -308,5 +308,5 @@ rte_rib6_create(const char *name, int socket_id, * * @param name - * Name of the rib object as passed to rte_rib_create() + * Name of the rib object as passed to rte_rib6_create() * @return * Pointer to RIB object on success -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-28 16:18:04.169723894 +0100 +++ 0005-rib-fix-references-for-IPv6-implementation.patch 2022-06-28 16:18:04.000387177 +0100 @@ -1 +1 @@ -From 26f5a0d5a6bb3d839d0361aac4ff46b6358bd2a7 Mon Sep 17 00:00:00 2001 +From 7181c621fb93c2080b7c1423b318424632e185ff Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 26f5a0d5a6bb3d839d0361aac4ff46b6358bd2a7 ] + @@ -17 +19 @@ -index 8bd99c4ab5..49d5b99b70 100644 +index 6f532265c6..d52b0b05cc 100644 @@ -20 +22 @@ -@@ -40,10 +40,10 @@ struct rte_rib6_node; +@@ -41,10 +41,10 @@ struct rte_rib6_node; @@ -33 +35 @@ -@@ -307,5 +307,5 @@ rte_rib6_create(const char *name, int socket_id, +@@ -308,5 +308,5 @@ rte_rib6_create(const char *name, int socket_id,