From nobody Tue May 20 15:47:00 2025 X-Original-To: dev-commits-src-main@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 4b1zSh4XW8z5wYnL; Tue, 20 May 2025 15:47:00 +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 4b1zSh3dNYz3q2n; Tue, 20 May 2025 15:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747756020; 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=KKe3pFOBlUfTL9IuMGPLfW9oZE0bHlnzfRGzKDqIrDU=; b=UDSBHjgjVswe5B2mkQBGcPTtR8MD9VesINgbPoHS2P+REkyyYhM1prtaC+okURxDmMhVo4 BX2UEYyaP9tq/ylPNixWmtKb3zFOj5PXMiTxXgb4EXliuyTVrjfcY/XLqHu1D/qTIapojo UGrv+G+AYDF2r2DyNKOIleVmslnZULkoHroJaEkJiSIhIVzZE7bzDbDbI/mj8ulFFRTs35 XqOSltN7IgRrA14jkIWyIuFlpqd9h9rUkplWlkGZPvpe2fIHq59FfcdQCpsNTX8gv6M+9j hVQ/RWqjhg9ECv8hTw3gxjLUUFoztiL95gUoU6HvEF3olROGuQGtO8/tt6a34g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747756020; 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=KKe3pFOBlUfTL9IuMGPLfW9oZE0bHlnzfRGzKDqIrDU=; b=i/Px4UxUxm8o2VYnVLAq0OUOfO9ui1SbIuHx4IP94kwfu+Eayzbkb6SGyJDL9bhRNDjCae brGnyV1ujsnOmr/Zi9Oxi+KE5yXIzkzSWgQwxO30EuA0LtwYDCGjcAUi8U72JBNrNZYxWE O7eZ+7faBFegyTjUi6jGB7Kv0AcA9clpfX79CO7LPQKIs2n3E/jaKAuFeJ7G4bPd8M/XcL qmJbo9zA7L7Tk8OvdlN+Y/yra07DJB40Osf41zvSb6Wtmuye/zCUGleVwtAbkNIJ4/Gyrm ldjILzXrI7kS4m+FRNwgKCrhvfnoMMIGBWfyJCqnTDjQ0gFkuWZmsAkrLxUlyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747756020; a=rsa-sha256; cv=none; b=ZxjkAbUVwmij8tHfvDjxu6suPXycl8HTGuMTws8nI8dkSld7CtqSQEilCK9eNCosnvNOi+ ioWupsLMFovyzVBQ0m9A0Bp+blBc1HEB7WLw2ByyOCA4KqXzSciYSgDO0FzztYyibrrxAI jFAhCqXX/BZl3ux31uQ6KEKabprMrh0SS0bA+Pb3SqCZTkN8wq6z3f5YcT59fvcQ9lNYW6 BhbiJsxvdhMBUtGpXGhK30glOKj5O4aarOuHy0lhAryyoz6+gp6YHUncvpa/ZIzCrWq0Mc hNht1XmSuvH6PLFAuyZ9sEH7A5cEs2yNwJFVPUCuo5GD+a0mDygKi7gEB+YuqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b1zSh2WbtzwKD; Tue, 20 May 2025 15:47:00 +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 54KFl0Z1047416; Tue, 20 May 2025 15:47:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KFl01Q047413; Tue, 20 May 2025 15:47:00 GMT (envelope-from git) Date: Tue, 20 May 2025 15:47:00 GMT Message-Id: <202505201547.54KFl01Q047413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 0693c3f7cb3d - main - ifnet: Integrate if_unroute() into if_down() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0693c3f7cb3d9e5389863a0c131ddef799c77091 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0693c3f7cb3d9e5389863a0c131ddef799c77091 commit 0693c3f7cb3d9e5389863a0c131ddef799c77091 Author: Zhenlei Huang AuthorDate: 2025-05-20 15:45:20 +0000 Commit: Zhenlei Huang CommitDate: 2025-05-20 15:45:20 +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 --- 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 974ff3af4f61..853fc3c78fce 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -278,7 +278,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 *); @@ -2097,25 +2096,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 *); @@ -2190,7 +2170,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); } /*