From nobody Fri Sep 1 08:59:05 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 4RcX5Q3Nlmz4sGmC; Fri, 1 Sep 2023 08:59:06 +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 4RcX5Q1NY8z3RPJ; Fri, 1 Sep 2023 08:59:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693558746; 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=stMfDboGV9a4OklapZBIIHgzK2ffakLYGZaKLnMuFA0=; b=B1lZK6ZXVrIbvbjqfsUJdYiPZHV5L4uFCp0NXUMJLS7gg+i85OgaJZeKR4oYrm9kf9zyPP bf1snto6Pvq18rZ5ohRIcMJMokahr7W33cZeOV7xDSeuGDEY7yZWABwXmiGwd5YHsMsnFo tQz/V+rNfEnLxECR9Cr51GiuDfVkux7VpOQHKHcxSiQwNB1YT3GI5JyFpMW8zxZ5ZBBDmR 0M7DU1rI83oKuQaLIbVb2q1bJQo4eUovO42lj/FPcF8F3i7pKYNMGThhpm+ShRMsxxDhAn bCkzgw/719Gs6MGCAbOB71ae4x/HZ526RZEk8DHprdJHcjjHY1KcZPBaS8uTUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693558746; a=rsa-sha256; cv=none; b=olUubP3O//Fnz5kzxjwvBrLa1D5ABh0RmrA4sAYCaP8MPrqglrJDPDi2t+uTO0IQ0f++Hd YbgNdLH9s8JspWkB5xZSh+rutsvDHTf/OZn5IKoOAnRoHoBnEtgiRRni4TBDhJbcwqt26V RTxDL51Qa2TEY26+F710gzR23DF+aHbu3MzJu3ykcm6tRGk6Ywk+5or27eI3gaA7DAvHGJ cwwTm9iGVBIVJ29pCEcJ+/aAl3bfnSQKCt1IvAXMULe798NflAx0xPSTL8RQkL25N1gnMB 7hBhhCW6Um9GpHMjmwL28AVtnuzyqD3Njpa/tnA21ZxI+rjlVXf80rb9SQDcdQ== 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=1693558746; 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=stMfDboGV9a4OklapZBIIHgzK2ffakLYGZaKLnMuFA0=; b=ACb1nzSpu4EvLMiExQs457tt+fAGLkMBeaczXd9aNUGC/JdReNRMFL7HSamlzhakXYTbcn bLd5H37UacZxCLJkVefazKu7llgETVzMKfjdQKuVDLQGp2ATAY6aHvwX4HVnDAg5QEQ/u0 utonpacJ863leBTcFr/QNUVjHub8KEcm7b8KTM6ygBKMVebOzX8++Czwk6Dul0eSmGYz/H VQZZ+kUUT8uLAZ2S8VS1cBJCSpxo/EWbfu4ykO16MZpJ20rRW7j+XKIsMsMnaine9dPeGL q0Gb2gXiE49ZOUn70/bYvFCCqTxfS69s6+6wgFesfZNxhVRMz/eLDypBHKZluw== 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 4RcX5Q0SsgzvHs; Fri, 1 Sep 2023 08:59:06 +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 3818x5CQ075746; Fri, 1 Sep 2023 08:59:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3818x50m075743; Fri, 1 Sep 2023 08:59:05 GMT (envelope-from git) Date: Fri, 1 Sep 2023 08:59:05 GMT Message-Id: <202309010859.3818x50m075743@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: 672b3df113b7 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 672b3df113b7df88eb99d7d9922c4229a82ceee7 Auto-Submitted: auto-generated The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=672b3df113b7df88eb99d7d9922c4229a82ceee7 commit 672b3df113b7df88eb99d7d9922c4229a82ceee7 Author: Andrey V. Elsukov AuthorDate: 2023-08-02 07:40:34 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-09-01 08:58:06 +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 7ef198f0b42f..dc3914c6f77a 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -2095,6 +2095,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;