diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-12 17:54:20 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-12 17:54:20 +0000 |
| commit | 867c8818e8cef8d36ba8f571e293897909d746c9 (patch) | |
| tree | 682641abf0547b319071c756a3cb2d533f2ad5fe | |
| parent | 8363739354c8a5538e6175f236d22c7c11b36056 (diff) | |
| download | illumos-joyent-867c8818e8cef8d36ba8f571e293897909d746c9.tar.gz | |
12674 want mac rx barrier function [fix more build breakage]
| -rw-r--r-- | usr/src/uts/common/io/mac/mac_sched.c | 11 | ||||
| -rw-r--r-- | usr/src/uts/common/io/mac/mac_util.c | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/usr/src/uts/common/io/mac/mac_sched.c b/usr/src/uts/common/io/mac/mac_sched.c index b4b1c0c18c..3502911efc 100644 --- a/usr/src/uts/common/io/mac/mac_sched.c +++ b/usr/src/uts/common/io/mac/mac_sched.c @@ -1347,7 +1347,7 @@ int mac_srs_worker_wakeup_ticks = 0; if (!(srs->srs_type & SRST_TX)) \ mutex_exit(&srs->srs_bw->mac_bw_lock); -#define MAC_TX_SRS_DROP_MESSAGE(srs, chain, cookie, s) { \ +#define MAC_TX_SRS_DROP_MESSAGE(srs, mp, cookie) { \ mac_pkt_drop(NULL, NULL, mp, B_FALSE); \ /* increment freed stats */ \ (srs)->srs_tx.st_stat.mts_sdrops++; \ @@ -3461,8 +3461,7 @@ mac_tx_srs_no_desc(mac_soft_ring_set_t *mac_srs, mblk_t *mp_chain, ASSERT(tx_mode == SRS_TX_DEFAULT || tx_mode == SRS_TX_BW); if (flag & MAC_DROP_ON_NO_DESC) { - MAC_TX_SRS_DROP_MESSAGE(mac_srs, mp_chain, cookie, - "Tx no desc"); + MAC_TX_SRS_DROP_MESSAGE(mac_srs, mp_chain, cookie); } else { if (mac_srs->srs_first != NULL) wakeup_worker = B_FALSE; @@ -3525,8 +3524,7 @@ mac_tx_srs_enqueue(mac_soft_ring_set_t *mac_srs, mblk_t *mp_chain, MAC_COUNT_CHAIN(mac_srs, mp_chain, tail, cnt, sz); if (flag & MAC_DROP_ON_NO_DESC) { if (mac_srs->srs_count > mac_srs->srs_tx.st_hiwat) { - MAC_TX_SRS_DROP_MESSAGE(mac_srs, mp_chain, cookie, - "Tx SRS hiwat"); + MAC_TX_SRS_DROP_MESSAGE(mac_srs, mp_chain, cookie); } else { MAC_TX_SRS_ENQUEUE_CHAIN(mac_srs, mp_chain, tail, cnt, sz); @@ -3899,8 +3897,7 @@ mac_tx_bw_mode(mac_soft_ring_set_t *mac_srs, mblk_t *mp_chain, cookie = (mac_tx_cookie_t)mac_srs; *ret_mp = mp_chain; } else { - MAC_TX_SRS_DROP_MESSAGE(mac_srs, mp_chain, cookie, - "Tx no bandwidth"); + MAC_TX_SRS_DROP_MESSAGE(mac_srs, mp_chain, cookie); } mutex_exit(&mac_srs->srs_lock); return (cookie); diff --git a/usr/src/uts/common/io/mac/mac_util.c b/usr/src/uts/common/io/mac/mac_util.c index bf5fa3c1c0..bf5bab586a 100644 --- a/usr/src/uts/common/io/mac/mac_util.c +++ b/usr/src/uts/common/io/mac/mac_util.c @@ -1543,7 +1543,7 @@ mac_strip_vlan_tag_chain(mblk_t *mp_chain) */ /* ARGSUSED */ void -mac_pkt_drop(void *arg, mac_resource_handle_t resource, mblk_t *mp_chain, +mac_pkt_drop(void *arg, mac_resource_handle_t resource, mblk_t *mp, boolean_t loopback) { mblk_t *mp1 = mp; |