From nobody Fri Jan 13 21:24:37 2023 X-Original-To: dev-commits-src-branches@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 4NtvZF5Yyvz2qkdb; Fri, 13 Jan 2023 21:24:37 +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 4NtvZF52lrz3y10; Fri, 13 Jan 2023 21:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645077; 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=oe/GiljfkdJeiOQmFZRQTa9vMc4xiN59u5LV5tigqp4=; b=mebppYOKTS2c60Xt3TWzIe0cQWJVw6llySogfxibutLtNRna/wK+YXIMJH+gLijl2Aa0P/ JUKt93hgvzaKPgpr2aGTtetHlFXqeqTM70rW5cRH9vfBg6P+MzKUhwYYJM1K0F5nDV1VQg WtJaNldA1yAYkm9sktYyb/4hS5gYSyQ1WMKgiMzYEYoHQVR9DL6o0dzibvgQORhjVLuHOh XG4edN6hy3b4Elmnwlz28QfkbJElJsehCRctULir14pEWjTRGZOZbANsCfNTBAQw1gM5oj bzUQ7d1GKKk46oYWUYKkXCnA8ZAvvK1MhZg/SAFBlnWYxLG0HF7IKTo6C03BVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645077; 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=oe/GiljfkdJeiOQmFZRQTa9vMc4xiN59u5LV5tigqp4=; b=E7p26PilHCDrHVE0Wy8sw+kZ70zqmlGN+Lp5Yqkl3oDoJogyU0f7yD6uJx3hEszOuqLnpX krVNphb8QTtqrKsceffxoZILXF7QvEikLWbSlRFjQNsnoecJQTfvqKtbonKCU0NoUvz/rv g7irBbL4w6sLW162Gd2xFhzOahmNdmSFMDvHDHyD3LBcAsWO6jVZ2W2CJRmELU5oF5va5v B0tk5KmXs5IEMYGFCWFJUx9Y/14uTd0DEUpMNSFlIcCYR+66SYk+DlrqnW8bdMBOke2CIk AymrHNDy0bortCHHv9q+GO0s6cQrHn1Ds0bkz/qPNqJeJHCtR6CV3SF08OnvbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645077; a=rsa-sha256; cv=none; b=WnkTyas0lZDI1ShK7r83HEGJD6BzunHzhOROj5OcnKpHTOZtpU016Vh9JY6TAafY9vHXL7 uzfBOzG8ORO4snleoYAi9te0Heyaj8DojG60S+EhNoIFxlFcb1NVYd6rYDm8cZbuMCUTrL okxmquSwUxuDTfwV/HR4PuhQ1EK9CqpisSa7VqR8aVafBNzacfAg5rQT1FIinuuvqwr9MJ 7t6ygOgCdEKPI0HA5FYiwkWHJzVXa//CkwXEJVYAt/BE4onT1IM4jm/X6Zfsqs7k+iA7nL qR7C/S1l2eT7PnOz2BLMMXPrJ628NMMBRGFJOUIHJGKTFkE/TeJoH42AGXHj5Q== 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 4NtvZF46RTzND6; Fri, 13 Jan 2023 21:24:37 +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 30DLObRn040268; Fri, 13 Jan 2023 21:24:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLObgK040267; Fri, 13 Jan 2023 21:24:37 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:24:37 GMT Message-Id: <202301132124.30DLObgK040267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: f51d7f8fb5b0 - stable/13 - routing: copy nexthop fib when changing existing nexthop List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: f51d7f8fb5b07060f6a21484bf9359bb457e08be Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=f51d7f8fb5b07060f6a21484bf9359bb457e08be commit f51d7f8fb5b07060f6a21484bf9359bb457e08be Author: Alexander V. Chernikov AuthorDate: 2023-01-13 12:28:22 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-13 21:18:24 +0000 routing: copy nexthop fib when changing existing nexthop MFC after: 1 day (cherry picked from commit 1b8b69508bc55a797ba344f95f05978408629e25) --- 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 5dfc275cd1e7..b0f31f400bd3 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -474,6 +474,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;