summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/io/bridge.c
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2018-10-19 23:35:32 +0300
committerToomas Soome <tsoome@me.com>2019-02-21 00:35:19 +0200
commitf1ccfd86d00d3a46fa8dc85b88860e10a3ad1019 (patch)
tree44fa61caf14ded4090e3c40d65ada3aa5647a954 /usr/src/uts/common/io/bridge.c
parentfb05fcb92e04bd3719e79f64be4c3432c2f1a119 (diff)
downloadillumos-joyent-f1ccfd86d00d3a46fa8dc85b88860e10a3ad1019.tar.gz
10423 bridge: cast between incompatible function types
Reviewed by: Andy Stormont <astormont@racktopsystems.com> Reviewed by: C Fraire <cfraire@me.com> Reviewed by: Andy Fiddaman <andy@omniosce.org> Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/uts/common/io/bridge.c')
-rw-r--r--usr/src/uts/common/io/bridge.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/uts/common/io/bridge.c b/usr/src/uts/common/io/bridge.c
index 28f16175ee..bc54527515 100644
--- a/usr/src/uts/common/io/bridge.c
+++ b/usr/src/uts/common/io/bridge.c
@@ -220,8 +220,8 @@ static struct qinit bridge_dld_rinit = {
};
static struct qinit bridge_dld_winit = {
- (int (*)())dld_wput, /* qi_putp */
- (int (*)())dld_wsrv, /* qi_srvp */
+ dld_wput, /* qi_putp */
+ dld_wsrv, /* qi_srvp */
NULL, /* qi_qopen */
NULL, /* qi_qclose */
NULL, /* qi_qadmin */
@@ -3303,7 +3303,7 @@ bridge_ioctl(queue_t *wq, mblk_t *mp)
miocnak(wq, mp, 0, rc);
}
-static void
+static int
bridge_wput(queue_t *wq, mblk_t *mp)
{
switch (DB_TYPE(mp)) {
@@ -3322,6 +3322,7 @@ bridge_wput(queue_t *wq, mblk_t *mp)
freemsg(mp);
break;
}
+ return (0);
}
/*
@@ -3425,7 +3426,7 @@ bridge_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
/* ARGSUSED */
static int
bridge_info(dev_info_t *dip, ddi_info_cmd_t infocmd, void *arg,
- void **result)
+ void **result)
{
int rc;