From nobody Wed Sep 04 14:29:01 2024 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 4WzPxp4Q0zz5V0wg; Wed, 04 Sep 2024 14:29:02 +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 4WzPxp0xRJz49MZ; Wed, 4 Sep 2024 14:29:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725460142; 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=in1D01hMpY8noWhgkQRbfSpYChoZAFNXr7C6+bQltSs=; b=ZaJCF3MQfPWnp9VubkmPaL72hG4wsEi80SQ/JuegPKoW6WPXCPELQm17T3R8kkr1uyoJfG AzK5lDVOyLkgNgL9vORcgdSriaqEbHTuWDhKP1vTHwzdYUmmR9eqISvAZ3CjxBMeyFIwhp J4jNV7XkxMoq4rGiZ5D9Z76MY+ksLAhNrWHgNE++dmYeyLYAdg5/WulJwtOzbd/HLy52t7 n8VSfYJwx9wOrmfp9z2oQiXC2TnWq/kN37h+OOCOeZDsNfF0eQbcIJcunR6Kr0fnKxfTWw uZgmL1rLHPLa//NuoV9FvFwoEvD3dnhNnFHWHhjURECo8c88JADQGwtubqtC+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725460142; a=rsa-sha256; cv=none; b=rTnAOwNjlTGtjA7v6gC7V86BIo4xfagEPeiXJxz7wFzx/qJmYdv2fhLQmWIpnOjDG14Ouc eW2uWoDc8lR50CXItC3inKj9rvt1AixyyZ7X66d+rX5Tbg+hmTgkGvmQ4KHyIGdkLLYVSu 18gdolpx9tF/FVfZnDKceCESjCTdf+IORyLogS+7PkQepmUk7hrYOz2ZX9movHqUUZmz+v ol9RSVRz76R9zZVcnZCcVA+tmSg65FtNlduXA165dbjzRPckW+3F0MpO4D5CAbtdWZO2WU TkPXVItkGXuTkBbFNoho9wCtMhlWA7nxR0iMjiFMN88Wn8VKJuy0SBIUC3iYUw== 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=1725460142; 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=in1D01hMpY8noWhgkQRbfSpYChoZAFNXr7C6+bQltSs=; b=fa9JfnNBGX1hRU3l1XRlsQ/VMr0A0FF8Ni2QTLrpxyiHpVgRQonSXsORD2R1xcb4/GAAdT a24lTieRO1oZV6loXZZeimNUlaatSojjfMAMlf7q6oBjIDCJZT6QqnPK73YEGLoha2I+3N L3dLjeaA6Ho+ndkc9xrvhM5hnxcSTfwzzgGRBCNbjhQWFBp9VVfIUzNVVnxDmP8drTqqpE reA9lHf6PK+/bAvpVf3aHqXPda1HKYLOZ5df6p4YZ4eA7MbHUrV9ObQiwrAGgigqUExk46 XSHPN2vOyOQ+wdhVYisRvGspyzKZhNAjArqhEyBa3OyEgxCLvBKn4w7ddCwvlA== 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 4WzPxp0G7fzSW7; Wed, 4 Sep 2024 14:29:02 +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 484ET1jo066053; Wed, 4 Sep 2024 14:29:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484ET1KY066050; Wed, 4 Sep 2024 14:29:01 GMT (envelope-from git) Date: Wed, 4 Sep 2024 14:29:01 GMT Message-Id: <202409041429.484ET1KY066050@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 408c909dc64f - main - ifnet: Remove if_getamcount() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 408c909dc64f77d2696d6fec77a2e0b00255cf96 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=408c909dc64f77d2696d6fec77a2e0b00255cf96 commit 408c909dc64f77d2696d6fec77a2e0b00255cf96 Author: Mark Johnston AuthorDate: 2024-09-04 13:07:11 +0000 Commit: Mark Johnston CommitDate: 2024-09-04 14:28:28 +0000 ifnet: Remove if_getamcount() All uses of this function were incorrect. if_amcount is a reference count which tracks the number of times the network stack internally set IFF_ALLMULTI. (if_pcount is the corresponding counter for IFF_PROMISC.) Remove if_getamcount() and fix up callers to get the number of assigned multicast addresses instead, since that's what they actually want. Sponsored by: Klara, Inc. Reviewed by: zlei, glebius MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46523 --- sys/dev/bxe/bxe.c | 2 +- sys/dev/liquidio/lio_ioctl.c | 2 +- sys/net/if.c | 6 ------ sys/net/if_var.h | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index 26a87354e5b1..3e7120a42a90 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -12174,7 +12174,7 @@ bxe_set_rx_mode(struct bxe_softc *sc) if (if_getflags(ifp) & IFF_PROMISC) { rx_mode = BXE_RX_MODE_PROMISC; } else if ((if_getflags(ifp) & IFF_ALLMULTI) || - ((if_getamcount(ifp) > BXE_MAX_MULTICAST) && + (if_llmaddr_count(ifp) > BXE_MAX_MULTICAST && CHIP_IS_E1(sc))) { rx_mode = BXE_RX_MODE_ALLMULTI; } else { diff --git a/sys/dev/liquidio/lio_ioctl.c b/sys/dev/liquidio/lio_ioctl.c index 10c88b209051..b2fd54f59580 100644 --- a/sys/dev/liquidio/lio_ioctl.c +++ b/sys/dev/liquidio/lio_ioctl.c @@ -481,7 +481,7 @@ lio_get_new_flags(if_t ifp) * Accept all multicast addresses if there are more than we * can handle */ - if (if_getamcount(ifp) > LIO_MAX_MULTICAST_ADDR) + if (if_llmaddr_count(ifp) > LIO_MAX_MULTICAST_ADDR) f |= LIO_IFFLAG_ALLMULTI; } if (if_getflags(ifp) & IFF_BROADCAST) diff --git a/sys/net/if.c b/sys/net/if.c index c71643a41bc5..4458d710d826 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4780,12 +4780,6 @@ if_getifaddr(const if_t ifp) return (ifp->if_addr); } -int -if_getamcount(const if_t ifp) -{ - return (ifp->if_amcount); -} - int if_setsendqready(if_t ifp) { diff --git a/sys/net/if_var.h b/sys/net/if_var.h index e493f8c7951e..cd074e4a8f4e 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -675,7 +675,6 @@ u_int if_lladdr_count(if_t); u_int if_llmaddr_count(if_t); bool if_maddr_empty(if_t); -int if_getamcount(const if_t ifp); struct ifaddr * if_getifaddr(const if_t ifp); typedef u_int if_addr_cb_t(void *, struct ifaddr *, u_int); u_int if_foreach_addr_type(if_t ifp, int type, if_addr_cb_t cb, void *cb_arg);