git: 8a6f38c8ac1b - main - ifnet: garbage collect drbr_*_drv().

From: Gleb Smirnoff <glebius_at_FreeBSD.org>
Date: Tue, 23 Nov 2021 03:52:11 UTC
The branch main has been updated by glebius:

URL: https://cgit.FreeBSD.org/src/commit/?id=8a6f38c8ac1b2d66624b6baef5795ef69b9b92c5

commit 8a6f38c8ac1b2d66624b6baef5795ef69b9b92c5
Author:     Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2021-11-23 03:49:57 +0000
Commit:     Gleb Smirnoff <glebius@FreeBSD.org>
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 *);