From nobody Thu Oct 10 10:03:26 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 4XPQLl3DzVz5YmJc; Thu, 10 Oct 2024 10:03:27 +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 4XPQLl0L7kz4sr6; Thu, 10 Oct 2024 10:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728554607; 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=ARnYsu5/sKhpLWZ+OPteRByUiQ12AieP8dRRtz4+4Yg=; b=TtWADNGf3iHhbj+blkUd30ccDNE9/P+1jNsQZtnxwnwze1VnyR9nl0x267Y+4Nlc3MCIU0 R58YTQigCHMIZ3ar/pBSYGklgfSE7/KeJ+UiaMZL7YLtB6M+CXHNegCaXEUkX1ooTpe7kv QE5KT7/cc1RFS34cFNkLzqZOfDNkCX5ahCUgig+1IpbHL2Np3ah46WoXmvXbiQO2UfPX8u gZbiAjA3eATQMqJmR4MhKfZX+onxigF/4yw+E+R99wLYJuPbeakBmpfKN4jfC1J9RGZd+P txez0OcPOe8bD95VO5zy3LYI4J8bNEEjV6I2YWsmAXShiJlNKNTVQdqTjqPjUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728554607; 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=ARnYsu5/sKhpLWZ+OPteRByUiQ12AieP8dRRtz4+4Yg=; b=CX12OHbZNvXH/iPRkPwj259M14RChOobn15oO5Cae1RY6HqbfAyCpD820rZi1+gVfVdclX 0E4YX0BePcvGsyFTfH/MKD3Ay7LA6kWM2lf99fJLBtyKx80O/Y5s8EOV1R2oNw1S6O5ZGt n8DX94+T3xKuJzBs0NP+7mPGNV5rZRHkY98EqZ7tFmj4wFawdY7mTErGnLq8kHphxxqBZu 9JewNxy8pXbSxiCGyz41TrdO1fWNZ9hXF9dMshlFatGgNhXEt36fIRLZ2sxLULlfNYEPRc w68ninyB42lA1BOweFVt/EGAtxyPZlUSINPGXUhL4zFEAxWc2pfSmogfhbsMXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728554607; a=rsa-sha256; cv=none; b=aqMhOga1I51khhsdPCKe8TJrzNlhf5JfjJXhVnbeokYik0DaAUmZ3t/w+wXH1lnIOOpam8 OYst9ZCYpkMUuDMh6GkyQm7dzmPtyueR7Pp3jZnvR8Is6BunziCnX9tOw3C0+HORXASVzh fOHdE4pDCAoJGTNSYPoaGC1TvmWaWAemWaCSNC65CtSS+JGzpJ42Z1TxSVwPnsk6G2rBce vlF5K0NbMbca7ONSIw0CvuRcclZ88Gdtjvx/kcpvSe3tYvMwnn4leGwOm95+xeoN8HqL5p v2MTWCG94FHGgJo9X5Na++sdZgoK6IlKtwaRYKmMx+XOe8hjWlr29CN/KwFZ/g== 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 4XPQLk73T5zt5G; Thu, 10 Oct 2024 10:03:26 +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 49AA3QU2052844; Thu, 10 Oct 2024 10:03:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49AA3Qtt052841; Thu, 10 Oct 2024 10:03:26 GMT (envelope-from git) Date: Thu, 10 Oct 2024 10:03:26 GMT Message-Id: <202410101003.49AA3Qtt052841@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: 66ce3c8460bb - stable/13 - 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 66ce3c8460bb9d4b98dd6230b9a685aaa6bc8d06 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=66ce3c8460bb9d4b98dd6230b9a685aaa6bc8d06 commit 66ce3c8460bb9d4b98dd6230b9a685aaa6bc8d06 Author: Mark Johnston AuthorDate: 2024-09-04 13:07:11 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-10 10:00:48 +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 (cherry picked from commit 408c909dc64f77d2696d6fec77a2e0b00255cf96) (cherry picked from commit b513c311d0db5c301c939b1cf44b2826e09011d3) --- 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 daed2ea9e5e4..78e2423dc4a7 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -12197,7 +12197,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 80ee9ed2dcfa..449bc0219798 100644 --- a/sys/dev/liquidio/lio_ioctl.c +++ b/sys/dev/liquidio/lio_ioctl.c @@ -481,7 +481,7 @@ lio_get_new_flags(struct ifnet *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 d2b47a749873..8a870bb4e1bc 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4387,12 +4387,6 @@ if_getifaddr(if_t ifp) return ((struct ifnet *)ifp)->if_addr; } -int -if_getamcount(if_t ifp) -{ - return ((struct ifnet *)ifp)->if_amcount; -} - int if_setsendqready(if_t ifp) { diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 9785dac2c265..24fe259d0046 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -761,7 +761,6 @@ u_int if_foreach_llmaddr(if_t, iflladdr_cb_t, void *); u_int if_lladdr_count(if_t); u_int if_llmaddr_count(if_t); -int if_getamcount(if_t ifp); struct ifaddr * if_getifaddr(if_t ifp); /* Functions */