From nobody Sun Jun 1 15:41:05 2025 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 4b9LmL2zPNz5xpPv; Sun, 01 Jun 2025 15:41: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9LmL0m5Mz3ChH; Sun, 01 Jun 2025 15:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748792466; 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=H1ciYGEm50qX+7hILr7LjwYFD68nU9q3tl8PlDJIYBs=; b=fnLwNsvo384tInqunIevpiJPaIWUTHvVwD5PQavy31EABv5I/Gh6IbpcqFEzldn8/G6KQM fnGZpZqWQ8KZEDhIZE6y48ErYqx19fHcCXYLOxxvyJQ69i43Xons58lUT++xgkHXhM+E3q fzZFPp6bbrkZ7UHrUa/+j/SKGgsdJKfvB6x1+pge7/odOeUJUSEcSfMQuUneitN3K7wyHg 2fylt4GRf2VXoWfhJWjZHDxg8HVxj+Vtj3Uh8HcToyOMfeNhLBNw/n5m9xJwBD2wdzD2jG CxjYVAmNz/4vGVhjD+rKrKtQRXiR/blcz1XXImMQ4mPsbojZB/JtD9mALzpztg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748792466; 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=H1ciYGEm50qX+7hILr7LjwYFD68nU9q3tl8PlDJIYBs=; b=MAmXTlw+J5p17+yyKEo9ROiSB3luZ5YG8ED1cll2yg7YftY1rFVPrsEVbDaoTSs4vv0dpp qnhhMAOFGHz6oNxNs3jF50C+kbw4Aqk8xpYymHVAacp2rZGAD8O8L5o3KP0NkJcIzHLr6H Qs1eZNLN7oC2RPrg/8blUDNHaeufDZAPVX1bbJsyGok25jkrTB0ivd4tYrZmg9g7yhoVdO wFqDZRUXqiBpkwdFxW5puMHBGd0Y3mlZNJL0idpWRlEIJi66+7cszZtXGBPI+kDE6yhcCf xX0XpWIEljKw0kypstGznEOoLFwZtOKkrRaFPI7WyeL9oMPFFKf8xlDiDZu8pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748792466; a=rsa-sha256; cv=none; b=b/6jtzlLUXqYN1T7EScsRMy6TDzz/BKUAE7On9up+t7kfEdzOBYN47gy9/m/k1xEqyv4rJ jecOD90VLHmk0t2KTpV72Y/SpLsy3IO3LvxKtOUeCCArfy/VQd8q/B/WmW64348EcSafsx lEpiFYb1Bc2pTRhDGyA8YicECf2gU+XGI9Ci5x13roMgMThbG1Mw2GnQwn3dojywMo9Ckl 2AaUC69DOKVzlTRdGSGa+hkk9P5B58CcjZypmSVOH47C+1ieaDWdB+omrX702omu85cYrx JZVTDZHhPra/zPmrmEW9bo++q3nz06XjfvlBYJQxfbn3pLKFJRcnaC/hyxGb5w== 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 4b9LmK709vzCgq; Sun, 01 Jun 2025 15:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 551Ff5GI056298; Sun, 1 Jun 2025 15:41:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Ff5mo056295; Sun, 1 Jun 2025 15:41:05 GMT (envelope-from git) Date: Sun, 1 Jun 2025 15:41:05 GMT Message-Id: <202506011541.551Ff5mo056295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ad5eecbfca54 - stable/14 - ifnet: Integrate if_unroute() into if_down() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ad5eecbfca54cfd2247c8fb3799ba292bf9668ed Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ad5eecbfca54cfd2247c8fb3799ba292bf9668ed commit ad5eecbfca54cfd2247c8fb3799ba292bf9668ed Author: Zhenlei Huang AuthorDate: 2025-05-20 15:45:20 +0000 Commit: Zhenlei Huang CommitDate: 2025-06-01 15:40:07 +0000 ifnet: Integrate if_unroute() into if_down() if_unroute() is static since 2004 and is not used anywhere except for if_down(). This also makes it easier to grep by the pattern `if_flags &= ~IFF_UP`. No functional change intended. Reviewed by: glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49356 (cherry picked from commit 0693c3f7cb3d9e5389863a0c131ddef799c77091) --- sys/net/if.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index fc39c1ffcff0..b4ffa9883efc 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -280,7 +280,6 @@ static void if_input_default(struct ifnet *, struct mbuf *); static int if_requestencap_default(struct ifnet *, struct if_encap_req *); static int if_setflag(struct ifnet *, int, int, int *, int); static int if_transmit_default(struct ifnet *ifp, struct mbuf *m); -static void if_unroute(struct ifnet *, int flag, int fam); static int if_delmulti_locked(struct ifnet *, struct ifmultiaddr *, int); static void do_link_state_change(void *, int); static int if_getgroup(struct ifgroupreq *, struct ifnet *); @@ -2098,25 +2097,6 @@ link_init_sdl(struct ifnet *ifp, struct sockaddr *paddr, u_char iftype) return (sdl); } -/* - * Mark an interface down and notify protocols of - * the transition. - */ -static void -if_unroute(struct ifnet *ifp, int flag, int fam) -{ - - KASSERT(flag == IFF_UP, ("if_unroute: flag != IFF_UP")); - - ifp->if_flags &= ~flag; - getmicrotime(&ifp->if_lastchange); - ifp->if_qflush(ifp); - - if (ifp->if_carp) - (*carp_linkstate_p)(ifp); - rt_ifmsg(ifp, IFF_UP); -} - void (*vlan_link_state_p)(struct ifnet *); /* XXX: private from if_vlan */ void (*vlan_trunk_cap_p)(struct ifnet *); /* XXX: private from if_vlan */ struct ifnet *(*vlan_trunkdev_p)(struct ifnet *); @@ -2191,7 +2171,14 @@ if_down(struct ifnet *ifp) { EVENTHANDLER_INVOKE(ifnet_event, ifp, IFNET_EVENT_DOWN); - if_unroute(ifp, IFF_UP, AF_UNSPEC); + + ifp->if_flags &= ~IFF_UP; + getmicrotime(&ifp->if_lastchange); + ifp->if_qflush(ifp); + + if (ifp->if_carp) + (*carp_linkstate_p)(ifp); + rt_ifmsg(ifp, IFF_UP); } /*