From nobody Fri Jan 28 18:31:26 2022 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 78F121988E93; Fri, 28 Jan 2022 18:31:26 +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 4JlmHy2WLTz4yQ2; Fri, 28 Jan 2022 18:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643394686; 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=QPflOZyd69dhrl1HcsqqfFwp24+qMzNA3gaFXV7RuTQ=; b=K4k0gowUQgcDx9+GgtJfKe1VlriNyaSk6DyWwClSpSNWaFCER2dreSlP7OJL4ExPSmgeNe ccig6iBhmrIB5V+2/Y9ACUqbHXCf+b2L4OHxfZhcN5RNRwlxMxEPPrKXlCO/5TS6p9yUXP LGh4ey93am29+EJDKlNeBkG8Sf3ueOZk3nDYIpZbEdtbADvr2BGMyaOF/TmntwkhST3mnV K8K3lPZS74S8y7ok8lNYAEa11okd2Umv4+uWmW0oc3lfnbu+/OCL03kyVezE5POAje/I8A Ev3gG1m5kh+PUFEOsHpDsYCfltVGqqsCK3eiU/q40kfQheYiUSC0P0A5dU3nZg== 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 2C80C2F127; Fri, 28 Jan 2022 18:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20SIVQl5099121; Fri, 28 Jan 2022 18:31:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20SIVQZT099120; Fri, 28 Jan 2022 18:31:26 GMT (envelope-from git) Date: Fri, 28 Jan 2022 18:31:26 GMT Message-Id: <202201281831.20SIVQZT099120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 964b8f8b993d - main - ifnet: garbage collect unused function ifaddr_byindex(). 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 964b8f8b993d48f66a3d3b46a4cd67c1f6d1e326 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643394686; 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=QPflOZyd69dhrl1HcsqqfFwp24+qMzNA3gaFXV7RuTQ=; b=v38YHT11M18AiuAAH42oFq0Wgefr8vU2VH9mE+DlvNmn7EVMTGTTdvrFlO3MH8gW2zhroY 8qerMplXR8XUCP2/SPB4P/b4QeAOtHvkSe/Jl+BDnKe0q1pR1/9F4xrp9zERGM+Pqy7Uvt A3Vfre0zZCKd2av2aPby8AMQExqh2PpcUKoVBdWmSK5N51B3xssCaUCnEwQussxIBJU7yj RIoxzE/Rmp9XRq4E3eO0lRXuPG/pQ8ATjP5gnXail+Y2VkU4lzwKRo7O4xPKRLzDkbMWTj DyGDMxhsZZMlzyvwfjPHv2Ix+mSJmTEB0tYQ731FG4HKZDGdvr9Uw5Sqs+esoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643394686; a=rsa-sha256; cv=none; b=l2INArDGldNPjLxBx+4k+Ix+k8VKlPuTVmgxCtCFu3lfcvOQakMOM4/E3ui38awYWR/H+T J6dWz3pA64KiCr0+Bh2ZIrGyINA8e0kZ9HOQU0Jd9tTW4di5rw7tv4VAq0AYAGU625/D+9 lB+8ehefl/961MWC3kecr0KfM9r5w3SdCKn82TmA61gP1CobXTqqcxH5FCa16nV9JPGW27 ADzq1KWef+YxOaPAzBI+4udfrx7tGvrROW1Ep7WexYZaWim7y+um5feOtGt9vVdqsqKrN8 mwmlaDDd0uFycMWohp/vG6wsriBeCgE872e9yMMEK93ENHacrpVgMXhnrHF53Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=964b8f8b993d48f66a3d3b46a4cd67c1f6d1e326 commit 964b8f8b993d48f66a3d3b46a4cd67c1f6d1e326 Author: Gleb Smirnoff AuthorDate: 2022-01-28 17:51:52 +0000 Commit: Gleb Smirnoff CommitDate: 2022-01-28 17:51:52 +0000 ifnet: garbage collect unused function ifaddr_byindex(). Last use was removed in 5adea417d49. --- sys/net/if.c | 14 -------------- sys/net/if_var.h | 9 +-------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index e8d65e64518a..f43c1597c413 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -412,20 +412,6 @@ ifnet_byindexgen(uint16_t idx, uint16_t gen) return (NULL); } -struct ifaddr * -ifaddr_byindex(u_short idx) -{ - struct ifnet *ifp; - struct ifaddr *ifa = NULL; - - NET_EPOCH_ASSERT(); - - ifp = ifnet_byindex(idx); - if (ifp != NULL && (ifa = ifp->if_addr) != NULL) - ifa_ref(ifa); - return (ifa); -} - /* * Network interface utility routines. * diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 21b3687f62c1..e054c613e9e6 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -373,7 +373,7 @@ struct ifnet { * addresses which store the link-level address and the name * of the interface. * However, access to the AF_LINK address through this - * field is deprecated. Use if_addr or ifaddr_byindex() instead. + * field is deprecated. Use if_addr instead. */ struct ifaddrhead if_addrhead; /* linked list of addresses per if */ struct ifmultihead if_multiaddrs; /* multicast addresses configured */ @@ -651,13 +651,6 @@ struct ifnet *ifnet_byindex_ref(u_int); */ struct ifnet *ifnet_byindexgen(uint16_t idx, uint16_t gen); -/* - * Given the index, ifaddr_byindex() returns the one and only - * link-level ifaddr for the interface. You are not supposed to use - * it to traverse the list of addresses associated to the interface. - */ -struct ifaddr *ifaddr_byindex(u_short idx); - VNET_DECLARE(struct ifnethead, ifnet); VNET_DECLARE(struct ifgrouphead, ifg_head); VNET_DECLARE(struct ifnet *, loif); /* first loopback interface */