From nobody Mon Mar 28 11:32:36 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AD2B91A3E5AD; Mon, 28 Mar 2022 11:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KRrCS4TWmz3tsR; Mon, 28 Mar 2022 11:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648467156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kSkxscduXc5lfbLewtB9Cuy6g0h8jv1W3VP81VSgUTA=; b=le8p7w/NwvPV4rE9ELbkBnSFzgbrJETpQ46warX5MssYnTAcLmJ2A9CGeL2lrsbnh/rSM6 YznAmsgAmNPAE/5emiyD7eMYSoyQDsaFP3HSjJbjeyM/gzceOnGAjgSfnfZ2vhZNhIAmj8 sOa7aSQrYke5+aM42a4HBlpgsPblwWA8cArY/AlQlyojtIhY7n9bL2ADS+c2qZ855sSaOa gVGZ6f5r7ORXo4Eu3IteVCswfl4zj5C2XWSH41WgxS6JPWVs3EQuqs1lmrBVqSEFqk5kx6 SHW2VpAQrcql7HmhiwiTiNPtmPVH9O3b20FfYYlShFxJSkm7fMZXTjriDpzl6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A21F1107; Mon, 28 Mar 2022 11:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22SBWa29076282; Mon, 28 Mar 2022 11:32:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SBWapF076281; Mon, 28 Mar 2022 11:32:36 GMT (envelope-from git) Date: Mon, 28 Mar 2022 11:32:36 GMT Message-Id: <202203281132.22SBWapF076281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 1b8b69508bc5 - main - routing: copy nexthop fib when changing existing nexthop List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b8b69508bc55a797ba344f95f05978408629e25 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648467156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kSkxscduXc5lfbLewtB9Cuy6g0h8jv1W3VP81VSgUTA=; b=D6uqaLcmPRhmid4wOAvhQBw2LBdUOYa5CN48Hh5uZ9543gTiSYeKshfaHy2RvkKKU+8Z5S 8UZwNUW18QkymHx8XMWO8CkClNo4gHsygZnP6PPwbTlGcjxqy8uygHwomb/rV5QNhYIaKF jmJ4G4zLb7cfH9CX/1MxZ2F74G6saTZ2dJtZf+gqd6rTHY9QqgTKX0WNUxlOFFQyHFR1L8 yfEzzne/JeaMu+SbJ7Xn+z8PbNpTA1HSMnFHsB4kAr3+PE6vNkvxX1kk1QfhwIFi5DoO9H 70bNxRP7J3CK3YCC2R+Lx8fSrVv23j6VibDZdvV1cF2bgE1TK1GEcZbWyvZ7ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648467156; a=rsa-sha256; cv=none; b=qQE13KAYmwt6MYh0fAMrLpqa8BLMZzAywU0KYN4hAyvC57Qjo11S46P+z2lXqZDJ+Jop2y 1pIij7/Uxu4meMXM4NJN/rFB8wAxB4sxGi3i2qwIb+1lwCa0LuF16NU1KsZAcOZ3LJihIT p2fEgNIXw7T8ZMs8G8gOTQ0wYgl0QpS/oobv97UBSU6nEBh0UW7PTA3cBhuY1rliWuiXax XCNBqtf6JAce7rlo2Z8zsxEJI8cTPcfZGYpcgpoGtO0jHqmTLTbBn4gC7RzyM9ZEJ5Xa7S tXzl23D9xFyrHXWZdid+gzMxP7uLuceL359hlivevdRwv98P/8pRwVf35LHHzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=1b8b69508bc55a797ba344f95f05978408629e25 commit 1b8b69508bc55a797ba344f95f05978408629e25 Author: Alexander V. Chernikov AuthorDate: 2022-03-28 11:31:23 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-03-28 11:32:30 +0000 routing: copy nexthop fib when changing existing nexthop MFC after: 1 day --- sys/net/route/nhop_ctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c index 16b8ca46739a..b9b6a6b59139 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -475,6 +475,7 @@ nhop_create_from_nhop(struct rib_head *rnh, const struct nhop_object *nh_orig, nh_priv->nh_neigh_family = nh_orig->nh_priv->nh_neigh_family; nh_priv->rt_flags = nh_orig->nh_priv->rt_flags; nh_priv->nh_type = nh_orig->nh_priv->nh_type; + nh_priv->nh_fibnum = nh_orig->nh_priv->nh_fibnum; nh->nh_ifp = nh_orig->nh_ifp; nh->nh_ifa = nh_orig->nh_ifa;