From nobody Tue Nov 23 03:52:11 2021 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 3D37F18A5210; Tue, 23 Nov 2021 03:52:12 +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 4Hyqvw1F1Sz3k56; Tue, 23 Nov 2021 03:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0A55473F7; Tue, 23 Nov 2021 03:52:12 +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 1AN3qBiI072533; Tue, 23 Nov 2021 03:52:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AN3qBSv072532; Tue, 23 Nov 2021 03:52:11 GMT (envelope-from git) Date: Tue, 23 Nov 2021 03:52:11 GMT Message-Id: <202111230352.1AN3qBSv072532@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: 8a6f38c8ac1b - main - ifnet: garbage collect drbr_*_drv(). 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 8a6f38c8ac1b2d66624b6baef5795ef69b9b92c5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8a6f38c8ac1b2d66624b6baef5795ef69b9b92c5 commit 8a6f38c8ac1b2d66624b6baef5795ef69b9b92c5 Author: Gleb Smirnoff AuthorDate: 2021-11-23 03:49:57 +0000 Commit: Gleb Smirnoff CommitDate: 2021-11-23 03:49:57 +0000 ifnet: garbage collect drbr_*_drv(). They were left in 62d76917b8678 but after years proved not to be useful. --- sys/dev/bxe/bxe.c | 2 +- sys/net/if.c | 26 -------------------------- sys/net/if_var.h | 6 ------ 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index 920a5a9bcbcb..62f608190f8e 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -5675,7 +5675,7 @@ bxe_tx_mq_start_locked(struct bxe_softc *sc, } /* fetch the depth of the driver queue */ - depth = drbr_inuse_drv(ifp, tx_br); + depth = drbr_inuse(ifp, tx_br); if (depth > fp->eth_q_stats.tx_max_drbr_queue_depth) { fp->eth_q_stats.tx_max_drbr_queue_depth = depth; } diff --git a/sys/net/if.c b/sys/net/if.c index c7a6706f41df..1cd44908ca0f 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4591,29 +4591,3 @@ if_setgetcounterfn(if_t ifp, if_get_counter_t fn) ifp->if_get_counter = fn; } - -/* Revisit these - These are inline functions originally. */ -int -drbr_inuse_drv(if_t ifh, struct buf_ring *br) -{ - return drbr_inuse(ifh, br); -} - -struct mbuf* -drbr_dequeue_drv(if_t ifh, struct buf_ring *br) -{ - return drbr_dequeue(ifh, br); -} - -int -drbr_needs_enqueue_drv(if_t ifh, struct buf_ring *br) -{ - return drbr_needs_enqueue(ifh, br); -} - -int -drbr_enqueue_drv(if_t ifh, struct buf_ring *br, struct mbuf *m) -{ - return drbr_enqueue(ifh, br, m); - -} diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 45fba9513a8b..c7e20edc537f 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -776,12 +776,6 @@ void if_settransmitfn(if_t ifp, if_transmit_fn_t); void if_setqflushfn(if_t ifp, if_qflush_fn_t); void if_setgetcounterfn(if_t ifp, if_get_counter_t); -/* Revisit the below. These are inline functions originally */ -int drbr_inuse_drv(if_t ifp, struct buf_ring *br); -struct mbuf* drbr_dequeue_drv(if_t ifp, struct buf_ring *br); -int drbr_needs_enqueue_drv(if_t ifp, struct buf_ring *br); -int drbr_enqueue_drv(if_t ifp, struct buf_ring *br, struct mbuf *m); - /* TSO */ void if_hw_tsomax_common(if_t ifp, struct ifnet_hw_tsomax *); int if_hw_tsomax_update(if_t ifp, struct ifnet_hw_tsomax *);