10538 sppp: cast between incompatible function types

Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Gergő Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>

3 files changed, 34 insertions, 29 deletions

diff --git a/usr/src/uts/common/io/ppp/sppp/sppp.c b/usr/src/uts/common/io/ppp/sppp/sppp.c
index 1b12b6406b..4cf02abe2e 100644
--- a/usr/src/uts/common/io/ppp/sppp/sppp.c
+++ b/usr/src/uts/common/io/ppp/sppp/sppp.c
@@ -98,7 +98,7 @@ static void	sppp_recv_nondata(queue_t *, mblk_t *, spppstr_t *);
 static queue_t	*sppp_outpkt(queue_t *, mblk_t **, int, spppstr_t *);
 static spppstr_t *sppp_inpkt(queue_t *, mblk_t *, spppstr_t *);
 static int	sppp_kstat_update(kstat_t *, int);
-static void 	sppp_release_pkts(sppa_t *, uint16_t);
+static void	sppp_release_pkts(sppa_t *, uint16_t);
 
 /*
  * sps_list contains the list of active per-stream instance state structures
@@ -697,7 +697,7 @@ sppp_ioctl(struct queue *q, mblk_t *mp)
  * Description:
  *    Upper write-side put procedure. Messages from above arrive here.
  */
-void
+int
 sppp_uwput(queue_t *q, mblk_t *mp)
 {
 	queue_t		*nextq;
@@ -739,7 +739,7 @@ sppp_uwput(queue_t *q, mblk_t *mp)
 			}
 		} else {
 			(void) sppp_mproto(q, mp, sps);
-			return;
+			return (0);
 		}
 		break;
 	case M_DATA:
@@ -762,12 +762,12 @@ sppp_uwput(queue_t *q, mblk_t *mp)
 		case PPPIO_BLOCKNP:
 		case PPPIO_UNBLOCKNP:
 			qwriter(q, mp, sppp_inner_ioctl, PERIM_INNER);
-			return;
+			return (0);
 		case I_LINK:
 		case I_UNLINK:
 		case PPPIO_NEWPPA:
 			qwriter(q, mp, sppp_outer_ioctl, PERIM_OUTER);
-			return;
+			return (0);
 		case PPPIO_NPMODE:
 		case PPPIO_GIDLE:
 		case PPPIO_GTYPE:
@@ -779,7 +779,7 @@ sppp_uwput(queue_t *q, mblk_t *mp)
 			 * they're moved off to a separate function.
 			 */
 			sppp_ioctl(q, mp);
-			return;
+			return (0);
 		case PPPIO_GETSTAT:
 			break;			/* 32 bit interface gone */
 		default:
@@ -802,7 +802,7 @@ sppp_uwput(queue_t *q, mblk_t *mp)
 					error = EAGAIN;
 					break;
 				}
-				return;
+				return (0);
 			} else {
 				ppa->ppa_ioctlsfwd++;
 				/*
@@ -815,7 +815,7 @@ sppp_uwput(queue_t *q, mblk_t *mp)
 				mutex_exit(&ppa->ppa_sta_lock);
 			}
 			putnext(ppa->ppa_lower_wq, mp);
-			return;		/* don't ack or nak the request */
+			return (0);	/* don't ack or nak the request */
 		}
 		/* Failure; send error back upstream. */
 		miocnak(q, mp, 0, error);
@@ -835,6 +835,7 @@ sppp_uwput(queue_t *q, mblk_t *mp)
 		freemsg(mp);
 		break;
 	}
+	return (0);
 }
 
 /*
@@ -851,7 +852,7 @@ sppp_uwput(queue_t *q, mblk_t *mp)
  *    the write-side queue. Therefore, this procedure gets called when
  *    the lower write service procedure qenable() the upper write stream queue.
  */
-void
+int
 sppp_uwsrv(queue_t *q)
 {
 	spppstr_t	*sps;
@@ -900,6 +901,7 @@ sppp_uwsrv(queue_t *q)
 			putnext(nextq, mp);
 		}
 	}
+	return (0);
 }
 
 void
@@ -1759,7 +1761,7 @@ sppp_outpkt(queue_t *q, mblk_t **mpp, int msize, spppstr_t *sps)
  *    the write queue here, this just back-enables all upper write side
  *    service procedures.
  */
-void
+int
 sppp_lwsrv(queue_t *q)
 {
 	sppa_t		*ppa;
@@ -1780,6 +1782,7 @@ sppp_lwsrv(queue_t *q)
 		}
 	}
 	rw_exit(&ppa->ppa_sib_lock);
+	return (0);
 }
 
 /*
@@ -1799,7 +1802,7 @@ sppp_lwsrv(queue_t *q)
  *    In this case, the only thing above us is passthru, and we might as well
  *    discard.
  */
-void
+int
 sppp_lrput(queue_t *q, mblk_t *mp)
 {
 	sppa_t		*ppa;
@@ -1807,7 +1810,7 @@ sppp_lrput(queue_t *q, mblk_t *mp)
 
 	if ((ppa = q->q_ptr) == NULL) {
 		freemsg(mp);
-		return;
+		return (0);
 	}
 
 	sps = ppa->ppa_ctl;
@@ -1819,6 +1822,7 @@ sppp_lrput(queue_t *q, mblk_t *mp)
 	} else if ((q = sppp_recv(q, &mp, sps)) != NULL) {
 		putnext(q, mp);
 	}
+	return (0);
 }
 
 /*
@@ -1832,13 +1836,14 @@ sppp_lrput(queue_t *q, mblk_t *mp)
  *    occurs in order to clean up any packets that came in while we were
  *    transferring in the lower stream.  Otherwise, it's not used.
  */
-void
+int
 sppp_lrsrv(queue_t *q)
 {
 	mblk_t *mp;
 
 	while ((mp = getq(q)) != NULL)
 		sppp_lrput(q, mp);
+	return (0);
 }
 
 /*
diff --git a/usr/src/uts/common/io/ppp/sppp/sppp.h b/usr/src/uts/common/io/ppp/sppp/sppp.h
index 71911c231e..63108a25e9 100644
--- a/usr/src/uts/common/io/ppp/sppp/sppp.h
+++ b/usr/src/uts/common/io/ppp/sppp/sppp.h
@@ -322,8 +322,8 @@ typedef struct sppa {
 	spppstr_t	*ppa_ip6_cache;	/* ptr to PPP_IPV6 upper stream */
 
 	kmutex_t	ppa_npmutex;	/* protects the 2 fields below */
-	uint32_t 	ppa_npflag;	/* network protocols blocked */
-	uint32_t 	ppa_holdpkts[3]; /* # of packets blocked per np */
+	uint32_t	ppa_npflag;	/* network protocols blocked */
+	uint32_t	ppa_holdpkts[3]; /* # of packets blocked per np */
 
 	zoneid_t	ppa_zoneid;	/* zone where PPA is in use */
 } sppa_t;
@@ -363,13 +363,13 @@ extern int	sppp_close(queue_t *, int, cred_t *);
 extern mblk_t	*sppp_dladdud(spppstr_t *, mblk_t *, t_scalar_t, boolean_t);
 extern void	sppp_dlpi_pinfoinit(void);
 extern void	sppp_dlprsendup(spppstr_t *, mblk_t *, t_scalar_t, boolean_t);
-extern void	sppp_lrput(queue_t *, mblk_t *);
-extern void	sppp_lrsrv(queue_t *);
-extern void	sppp_lwsrv(queue_t *);
+extern int	sppp_lrput(queue_t *, mblk_t *);
+extern int	sppp_lrsrv(queue_t *);
+extern int	sppp_lwsrv(queue_t *);
 extern int	sppp_mproto(queue_t *, mblk_t *, spppstr_t *);
 extern int	sppp_open(queue_t *, dev_t *, int, int, cred_t *);
-extern void	sppp_uwput(queue_t *, mblk_t *);
-extern void	sppp_uwsrv(queue_t *);
+extern int	sppp_uwput(queue_t *, mblk_t *);
+extern int	sppp_uwsrv(queue_t *);
 extern void	sppp_remove_ppa(spppstr_t *sps);
 extern sppa_t	*sppp_find_ppa(uint32_t ppa_id);
 extern sppa_t	*sppp_create_ppa(uint32_t ppa_id, zoneid_t zoneid);
diff --git a/usr/src/uts/common/io/ppp/sppp/sppp_mod.c b/usr/src/uts/common/io/ppp/sppp/sppp_mod.c
index 168cf17f49..6948032309 100644
--- a/usr/src/uts/common/io/ppp/sppp/sppp_mod.c
+++ b/usr/src/uts/common/io/ppp/sppp/sppp_mod.c
@@ -93,8 +93,8 @@ static struct qinit sppp_urinit = {
 };
 
 static struct qinit sppp_uwinit = {
-	(int (*)())sppp_uwput,	/* qi_putp */
-	(int (*)())sppp_uwsrv,	/* qi_srvp */
+	sppp_uwput,		/* qi_putp */
+	sppp_uwsrv,		/* qi_srvp */
 	NULL,			/* qi_qopen */
 	NULL,			/* qi_qclose */
 	NULL,			/* qi_qadmin */
@@ -103,8 +103,8 @@ static struct qinit sppp_uwinit = {
 };
 
 static struct qinit sppp_lrinit = {
-	(int (*)())sppp_lrput,	/* qi_putp */
-	(int (*)())sppp_lrsrv,	/* qi_srvp */
+	sppp_lrput,		/* qi_putp */
+	sppp_lrsrv,		/* qi_srvp */
 	NULL,			/* qi_qopen */
 	NULL,			/* qi_qclose */
 	NULL,			/* qi_qadmin */
@@ -114,7 +114,7 @@ static struct qinit sppp_lrinit = {
 
 static struct qinit sppp_lwinit = {
 	NULL,			/* qi_putp */
-	(int (*)())sppp_lwsrv,	/* qi_srvp */
+	sppp_lwsrv,		/* qi_srvp */
 	NULL,			/* qi_qopen */
 	NULL,			/* qi_qclose */
 	NULL,			/* qi_qadmin */
@@ -162,10 +162,10 @@ static struct streamtab sppp_tab = {
  * the system's stability and performance.
  */
 DDI_DEFINE_STREAM_OPS(sppp_ops,						\
-	nulldev, nulldev,						\
-	_mi_driver_attach, _mi_driver_detach, nodev, _mi_driver_info,	\
-	D_NEW | D_MP | D_MTQPAIR | D_MTOUTPERIM | D_MTOCEXCL | D_MTPUTSHARED, \
-	&sppp_tab, ddi_quiesce_not_supported);
+    nulldev, nulldev,							\
+    _mi_driver_attach, _mi_driver_detach, nodev, _mi_driver_info,	\
+    D_NEW | D_MP | D_MTQPAIR | D_MTOUTPERIM | D_MTOCEXCL | D_MTPUTSHARED, \
+    &sppp_tab, ddi_quiesce_not_supported);
 
 static struct modldrv modldrv = {
 	&mod_driverops,				/* drv_modops */