diff options
| author | Toomas Soome <tsoome@me.com> | 2018-10-19 23:35:32 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-02-21 00:35:19 +0200 |
| commit | f1ccfd86d00d3a46fa8dc85b88860e10a3ad1019 (patch) | |
| tree | 44fa61caf14ded4090e3c40d65ada3aa5647a954 | |
| parent | fb05fcb92e04bd3719e79f64be4c3432c2f1a119 (diff) | |
| download | illumos-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>
| -rw-r--r-- | usr/src/uts/common/io/bridge.c | 9 | ||||
| -rw-r--r-- | usr/src/uts/common/io/dld/dld_str.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/dld.h | 6 |
3 files changed, 12 insertions, 9 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; diff --git a/usr/src/uts/common/io/dld/dld_str.c b/usr/src/uts/common/io/dld/dld_str.c index 24b5ab2e72..6042e69e59 100644 --- a/usr/src/uts/common/io/dld/dld_str.c +++ b/usr/src/uts/common/io/dld/dld_str.c @@ -394,7 +394,7 @@ dld_close(queue_t *rq, int flags __unused, cred_t *credp __unused) /* * qi_qputp: put(9e) */ -void +int dld_wput(queue_t *wq, mblk_t *mp) { dld_str_t *dsp = (dld_str_t *)wq->q_ptr; @@ -463,17 +463,19 @@ dld_wput(queue_t *wq, mblk_t *mp) freemsg(mp); break; } + return (0); } /* * qi_srvp: srv(9e) */ -void +int dld_wsrv(queue_t *wq) { dld_str_t *dsp = wq->q_ptr; DLD_CLRQFULL(dsp); + return (0); } void diff --git a/usr/src/uts/common/sys/dld.h b/usr/src/uts/common/sys/dld.h index f2c628b06e..6449f39a35 100644 --- a/usr/src/uts/common/sys/dld.h +++ b/usr/src/uts/common/sys/dld.h @@ -291,7 +291,7 @@ typedef struct dld_ioc_macprop_s { datalink_id_t pr_linkid; mac_prop_id_t pr_num; uint_t pr_perm_flags; - char pr_name[MAXLINKPROPNAME]; + char pr_name[MAXLINKPROPNAME]; uint_t pr_valsize; /* sizeof pr_val */ char pr_val[1]; } dld_ioc_macprop_t; @@ -441,8 +441,8 @@ int dld_getinfo(dev_info_t *, ddi_info_cmd_t, void *, void **); int dld_devt_to_instance(dev_t); int dld_open(queue_t *, dev_t *, int, int, cred_t *); int dld_close(queue_t *, int, cred_t *); -void dld_wput(queue_t *, mblk_t *); -void dld_wsrv(queue_t *); +int dld_wput(queue_t *, mblk_t *); +int dld_wsrv(queue_t *); int dld_str_open(queue_t *, dev_t *, void *); int dld_str_close(queue_t *); void *dld_str_private(queue_t *); |