From 5647635c25e095eb92ade015b8b639aaf8bcdcac Mon Sep 17 00:00:00 2001 From: Ryan Zezeski Date: Thu, 21 Sep 2017 18:02:16 +0000 Subject: 8668 mac_srs_change_upcall() is unused 8669 MAC_DBG_PRT is unused Reviewed by: Robert Mustacchi Reviewed by: Jerry Jelinek Reviewed by: Sebastian Wiedenroth Reviewed by: Yuri Pankov Approved by: Dan McDonald --- usr/src/uts/common/io/mac/mac.c | 3 --- usr/src/uts/common/io/mac/mac_datapath_setup.c | 24 ------------------------ usr/src/uts/common/sys/mac_impl.h | 11 ----------- usr/src/uts/common/sys/mac_soft_ring.h | 2 +- 4 files changed, 1 insertion(+), 39 deletions(-) (limited to 'usr/src') diff --git a/usr/src/uts/common/io/mac/mac.c b/usr/src/uts/common/io/mac/mac.c index e9518233f2..1471ddba3e 100644 --- a/usr/src/uts/common/io/mac/mac.c +++ b/usr/src/uts/common/io/mac/mac.c @@ -343,9 +343,6 @@ boolean_t mac_flow_log_enable; boolean_t mac_link_log_enable; timeout_id_t mac_logging_timer; -/* for debugging, see MAC_DBG_PRT() in mac_impl.h */ -int mac_dbg = 0; - #define MACTYPE_KMODDIR "mac" #define MACTYPE_HASHSZ 67 static mod_hash_t *i_mactype_hash; diff --git a/usr/src/uts/common/io/mac/mac_datapath_setup.c b/usr/src/uts/common/io/mac/mac_datapath_setup.c index 8724216920..8a8f9a9269 100644 --- a/usr/src/uts/common/io/mac/mac_datapath_setup.c +++ b/usr/src/uts/common/io/mac/mac_datapath_setup.c @@ -1593,30 +1593,6 @@ mac_srs_update_bwlimit(flow_entry_t *flent, mac_resource_props_t *mrp) mac_tx_srs_update_bwlimit(flent->fe_tx_srs, mrp); } -void -mac_srs_change_upcall(void *arg, mac_direct_rx_t rx_func, void *rx_arg1) -{ - mac_soft_ring_set_t *mac_srs = arg; - mac_srs_rx_t *srs_rx = &mac_srs->srs_rx; - mac_soft_ring_t *softring; - - mutex_enter(&mac_srs->srs_lock); - ASSERT((mac_srs->srs_type & SRST_TX) == 0); - srs_rx->sr_func = rx_func; - srs_rx->sr_arg1 = rx_arg1; - - softring = mac_srs->srs_soft_ring_head; - while (softring != NULL) { - mutex_enter(&softring->s_ring_lock); - softring->s_ring_rx_func = rx_func; - softring->s_ring_rx_arg1 = rx_arg1; - mutex_exit(&softring->s_ring_lock); - softring = softring->s_ring_next; - } - - mutex_exit(&mac_srs->srs_lock); -} - /* * When the first sub-flow is added to a link, we disable polling on the * link and also modify the entry point to mac_rx_srs_subflow_process. diff --git a/usr/src/uts/common/sys/mac_impl.h b/usr/src/uts/common/sys/mac_impl.h index 292550db62..2582a1914f 100644 --- a/usr/src/uts/common/sys/mac_impl.h +++ b/usr/src/uts/common/sys/mac_impl.h @@ -667,17 +667,6 @@ typedef struct mac_notify_task_arg { mac_ring_t *mnt_ring; } mac_notify_task_arg_t; -/* - * XXX All MAC_DBG_PRTs must be replaced with call to dtrace probes. For now - * it may be easier to have these printfs for easier debugging - */ -#ifdef DEBUG -extern int mac_dbg; -#define MAC_DBG_PRT(a) if (mac_dbg > 0) {(void) printf a; } -#else -#define MAC_DBG_PRT(a) -#endif - /* * The mac_perim_handle_t is an opaque type that encodes the 'mip' pointer * and whether internally a mac_open was done when acquiring the perimeter. diff --git a/usr/src/uts/common/sys/mac_soft_ring.h b/usr/src/uts/common/sys/mac_soft_ring.h index 88f1aa7249..e96c41ae91 100644 --- a/usr/src/uts/common/sys/mac_soft_ring.h +++ b/usr/src/uts/common/sys/mac_soft_ring.h @@ -22,6 +22,7 @@ /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2017 Joyent, Inc. */ #ifndef _SYS_MAC_SOFT_RING_H @@ -652,7 +653,6 @@ extern cpu_t *mac_srs_bind(mac_soft_ring_set_t *, processorid_t); extern void mac_rx_srs_retarget_intr(mac_soft_ring_set_t *, processorid_t); extern void mac_tx_srs_retarget_intr(mac_soft_ring_set_t *); -extern void mac_srs_change_upcall(void *, mac_direct_rx_t, void *); extern void mac_srs_quiesce_initiate(mac_soft_ring_set_t *); extern void mac_srs_client_poll_enable(struct mac_client_impl_s *, mac_soft_ring_set_t *); -- cgit v1.2.3