From nobody Fri Sep 1 09:07:15 2023 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 4RcXGq4Ky8z4sHDJ; Fri, 1 Sep 2023 09:07:15 +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 4RcXGq3rzNz3S35; Fri, 1 Sep 2023 09:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693559235; 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=9Gyws+Sh+5YJfKS4itjHChhgYnmVlItVq4R143ztskM=; b=xSuJh0vJ1wkSlbh+VC1me9bzBZ2r0SnzCJBGDjaeIliCfnK+u7VpfXi6ynalUTsXlb6PBm QZ0mu02+OpC+NRQVMJYSuqwiu69Y90oZ0Q6PSsFpfjKA8YlxF0qL1jDvN4Vz9uM35jUSq0 /rzZ9rWeL9L1c9MR+y+yh70yWQqZFJdGYeBIVtMVpwOeui8biFXi8QzKvyei/qbtAZu5hX 2V6w5rlk/dxNIFip2aYT1SDUTwd/ip+nUBLNp++liEKLzagrc4G+IGKGri+tI9H6bG5k0Q 6OvY+JO+OUu4HCQB9PDXSTD0M2NZB7GYzn7NCOHMgbE6iomJ9TZM92e1P06F8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693559235; a=rsa-sha256; cv=none; b=piX+iiR6enVozLnc3UtPmD9j0xiPogU1nrpZUL/fVNyGNkYDUg8C0pUttCcmXVBpCQnfMM TXeFJkJIMpSpzeJC3C4plfitrndkPf5ceZhbR76ZQlxasi5m/AvSnCRNveCcsD9t8HA/nn 9S2C8UAVt652psLwG6DZAc4K8MjAwp0cRv4AhQUXL7AsNBavZzBsCLrVDeZDUzsYbU3//0 DEEm2O1gkQFwzEx4hNEfy+nVT/s4noK1j2SAA3JIvD46UREjBkP1RRMOe8edKdU+S5jpyV M/v6R2xB5HgbmoHlthmUfAIGk4o9tNHpDQa1rQNDFuwCRB4XCQB20APeqKXgsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693559235; 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=9Gyws+Sh+5YJfKS4itjHChhgYnmVlItVq4R143ztskM=; b=Na8B9RM1frys06hiqUXJJ8XzZqMP/5MUIEMC4dDbS8Tu0q5sazujzO36RSEJBtiFDBuwuv zvFaytsBbzmlv+mRXBsz1LX6zeuTNuYTNx1aOVZTnop22oNiUHnkh7mykcuRKFS5oT8t3Q 9V1OeLNqlWz5ZVoXkP0HRrnGzwv6fU1TzDyKZLf+I8G3maW+KBELiWovh6Z2RhWguPIzHO HrVCqPyICueR9UW6PgMOfKGd2QeIlv/QbYuiZL3lEcuXJMRdIsj/LpfmxHgg+Wfn+fTp18 6D51ynQTAihSGQgRbpazWChTN4bVvV3YtjdvSHjTrsOrO4tI+ItjITOibmEf4g== 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 4RcXGq2x15zvX9; Fri, 1 Sep 2023 09:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38197FCn092973; Fri, 1 Sep 2023 09:07:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38197FTf092970; Fri, 1 Sep 2023 09:07:15 GMT (envelope-from git) Date: Fri, 1 Sep 2023 09:07:15 GMT Message-Id: <202309010907.38197FTf092970@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: de114db0fe90 - stable/12 - carp: delete interface routes on link loss. 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: de114db0fe90b45cd1a49ce3dcdc8c68051565ba Auto-Submitted: auto-generated The branch stable/12 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=de114db0fe90b45cd1a49ce3dcdc8c68051565ba commit de114db0fe90b45cd1a49ce3dcdc8c68051565ba Author: Andrey V. Elsukov AuthorDate: 2023-08-02 07:40:34 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-09-01 09:02:23 +0000 carp: delete interface routes on link loss. Obtained from: Yandex LLC MFC after: 10 days Sponsored by: Yandex LLC Differential Revision: https://reviews.freebsd.org/D41290 (cherry picked from commit 600bf006d3f15f170b9209d5d3a37437bfe0850e) --- sys/netinet/ip_carp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index acf819df694a..544e9e640c2c 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -2074,6 +2074,7 @@ carp_sc_state(struct carp_softc *sc) #endif carp_set_state(sc, INIT, "hardware interface down"); carp_setrun(sc, 0); + carp_delroute(sc); if (!sc->sc_suppress) carp_demote_adj(V_carp_ifdown_adj, "interface down"); sc->sc_suppress = 1;