diff --git a/sys/dev/i2o/iop.c b/sys/dev/i2o/iop.c index b2e77533c883..ef62d91d6915 100644 --- a/sys/dev/i2o/iop.c +++ b/sys/dev/i2o/iop.c @@ -1,4 +1,4 @@ -/* $NetBSD: iop.c,v 1.56 2006/08/23 15:44:29 christos Exp $ */ +/* $NetBSD: iop.c,v 1.57 2006/08/30 17:07:33 christos Exp $ */ /*- * Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.56 2006/08/23 15:44:29 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.57 2006/08/30 17:07:33 christos Exp $"); #include "opt_i2o.h" #include "iop.h" @@ -115,19 +115,19 @@ dev_type_ioctl(iopioctl); const struct cdevsw iop_cdevsw = { iopopen, iopclose, noread, nowrite, iopioctl, - nostop, notty, nopoll, nommap, nokqfilter, + nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, }; #define IC_CONFIGURE 0x01 #define IC_PRIORITY 0x02 -struct iop_class { +static struct iop_class { u_short ic_class; u_short ic_flags; #ifdef I2OVERBOSE const char *ic_caption; #endif -} static const iop_class[] = { +} const iop_class[] = { { I2O_CLASS_EXECUTIVE, 0, @@ -2600,7 +2600,10 @@ iop_passthrough(struct iop_softc *sc, struct ioppt *pt, struct proc *p) if (pt->pt_msglen > sc->sc_framesize || pt->pt_msglen < sizeof(struct i2o_msg) || pt->pt_nbufs > IOP_MAX_MSG_XFERS || - pt->pt_nbufs < 0 || pt->pt_replylen < 0 || + pt->pt_nbufs < 0 || +#if 0 + pt->pt_replylen < 0 || +#endif pt->pt_timo < 1000 || pt->pt_timo > 5*60*1000) return (EINVAL);