diff options
| author | Toomas Soome <tsoome@me.com> | 2018-10-21 22:40:53 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-11-14 10:06:10 +0200 |
| commit | 2c465844f6cd2c93703f5788a09237087300a2ac (patch) | |
| tree | bff95a1e39ea0046dbb2c9a0ac7d9f5bd2cd2ff1 | |
| parent | af1d63aba5cec023f92214c1f1faec9b489ac517 (diff) | |
| download | illumos-joyent-2c465844f6cd2c93703f5788a09237087300a2ac.tar.gz | |
11793 mac: cast between incompatible function types
Reviewed by: Ryan Zezeski <ryan@zinascii.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/common/io/mac/mac_datapath_setup.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/common/io/mac/mac_soft_ring.c | 3 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/mac_soft_ring.h | 2 |
3 files changed, 5 insertions, 6 deletions
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 81278cfdee..0355b544d5 100644 --- a/usr/src/uts/common/io/mac/mac_datapath_setup.c +++ b/usr/src/uts/common/io/mac/mac_datapath_setup.c @@ -1705,10 +1705,8 @@ mac_srs_create_proto_softrings(int id, uint16_t type, pri_t pri, bzero(&mrf, sizeof (mac_rx_fifo_t)); mrf.mrf_type = MAC_RX_FIFO; mrf.mrf_receive = (mac_receive_t)mac_soft_ring_poll; - mrf.mrf_intr_enable = - (mac_intr_enable_t)mac_soft_ring_intr_enable; - mrf.mrf_intr_disable = - (mac_intr_disable_t)mac_soft_ring_intr_disable; + mrf.mrf_intr_enable = (mac_intr_enable_t)mac_soft_ring_intr_enable; + mrf.mrf_intr_disable = (mac_intr_disable_t)mac_soft_ring_intr_disable; mrf.mrf_flow_priority = pri; softring = mac_soft_ring_create(id, mac_soft_ring_worker_wait, diff --git a/usr/src/uts/common/io/mac/mac_soft_ring.c b/usr/src/uts/common/io/mac/mac_soft_ring.c index dc8cfdd145..d24c0207df 100644 --- a/usr/src/uts/common/io/mac/mac_soft_ring.c +++ b/usr/src/uts/common/io/mac/mac_soft_ring.c @@ -498,7 +498,7 @@ done: * Enabling is allow the processing thread to send packets to the * client while disabling does the opposite. */ -void +int mac_soft_ring_intr_enable(void *arg) { mac_soft_ring_t *ringp = (mac_soft_ring_t *)arg; @@ -507,6 +507,7 @@ mac_soft_ring_intr_enable(void *arg) if (ringp->s_ring_first != NULL) mac_soft_ring_worker_wakeup(ringp); mutex_exit(&ringp->s_ring_lock); + return (0); } boolean_t diff --git a/usr/src/uts/common/sys/mac_soft_ring.h b/usr/src/uts/common/sys/mac_soft_ring.h index 581e18d06e..5a41899e60 100644 --- a/usr/src/uts/common/sys/mac_soft_ring.h +++ b/usr/src/uts/common/sys/mac_soft_ring.h @@ -691,7 +691,7 @@ extern void mac_srs_update_drv(struct mac_client_impl_s *); extern void mac_update_srs_priority(mac_soft_ring_set_t *, pri_t); extern void mac_client_update_classifier(mac_client_impl_t *, boolean_t); -extern void mac_soft_ring_intr_enable(void *); +extern int mac_soft_ring_intr_enable(void *); extern boolean_t mac_soft_ring_intr_disable(void *); extern mac_soft_ring_t *mac_soft_ring_create(int, clock_t, uint16_t, pri_t, mac_client_impl_t *, mac_soft_ring_set_t *, |