 @@ -1,14 +1,14 @@
-/*	$NetBSD: bsd-comp.c,v 1.18 2008/06/15 16:37:21 christos Exp $	*/
+/*	$NetBSD: bsd-comp.c,v 1.19 2008/11/25 02:40:36 cube Exp $	*/
 /*	Id: bsd-comp.c,v 1.6 1996/08/28 06:31:58 paulus Exp 	*/
 /* Because this code is derived from the 4.3BSD compress source:
+ *
+ *
  * Copyright (c) 1985, 1986 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * James A. Woods, derived from original work by Spencer Thomas
  * and Joseph Orost.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -31,32 +31,33 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * This version is for use with mbufs on BSD-derived systems.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bsd-comp.c,v 1.18 2008/06/15 16:37:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bsd-comp.c,v 1.19 2008/11/25 02:40:36 cube Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/module.h>
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/ppp_defs.h>
 #include <net/if_ppp.h>
 #define PACKETPTR	struct mbuf *
 #include <net/ppp-comp.h>
 #if DO_BSD_COMPRESS
 /*
  * PPP "BSD compress" compression
  *  The differences between this compression and the classic BSD LZW
  *  source are obvious from the requirement that the classic code worked
 @@ -137,41 +138,42 @@ static int	bsd_comp_init(void *state, u_
 static int	bsd_decomp_init(void *state, u_char *options, int opt_len,
 				int unit, int hdrlen, int mru, int debug);
 static int	bsd_compress(void *state, struct mbuf **mret,
 			     struct mbuf *mp, int slen, int maxolen);
 static void	bsd_incomp(void *state, struct mbuf *dmsg);
 static int	bsd_decompress(void *state, struct mbuf *cmp,
 			       struct mbuf **dmpp);
 static void	bsd_reset(void *state);
 static void	bsd_comp_stats(void *state, struct compstat *stats);
 /*
  * Procedures exported to if_ppp.c.
  */
-struct compressor ppp_bsd_compress = {
+static struct compressor ppp_bsd_compress = {
-    CI_BSD_COMPRESS,		/* compress_proto */
+    .compress_proto =	CI_BSD_COMPRESS,
-    bsd_comp_alloc,		/* comp_alloc */
+    .comp_alloc =	bsd_comp_alloc,
-    bsd_free,			/* comp_free */
+    .comp_free =	bsd_free,
-    bsd_comp_init,		/* comp_init */
+    .comp_init =	bsd_comp_init,
-    bsd_reset,			/* comp_reset */
+    .comp_reset =	bsd_reset,
-    bsd_compress,		/* compress */
+    .compress =		bsd_compress,
-    bsd_comp_stats,		/* comp_stat */
+    .comp_stat =	bsd_comp_stats,
-    bsd_decomp_alloc,		/* decomp_alloc */
+    .decomp_alloc =	bsd_decomp_alloc,
-    bsd_free,			/* decomp_free */
+    .decomp_free =	bsd_free,
-    bsd_decomp_init,		/* decomp_init */
+    .decomp_init =	bsd_decomp_init,
-    bsd_reset,			/* decomp_reset */
+    .decomp_reset =	bsd_reset,
-    bsd_decompress,		/* decompress */
+    .decompress =	bsd_decompress,
-    bsd_incomp,			/* incomp */
+    .incomp =		bsd_incomp,
-    bsd_comp_stats,		/* decomp_stat */
+    .decomp_stat =	bsd_comp_stats,
     .comp_name =	"ppp_bsdcomp"
 };
 /*
  * the next two codes should not be changed lightly, as they must not
  * lie within the contiguous general code space.
  */
 #define CLEAR	256			/* table clear output code */
 #define FIRST	257			/* first free entry */
 #define LAST	255
 #define MAXCODE(b)	((1 << (b)) - 1)
 #define BADCODEM1	MAXCODE(BSD_MAX_BITS)
 @@ -1078,14 +1080,34 @@ bsd_decompress(void *state, struct mbuf
 	printf("bsd_decomp%d: fell off end of chain ", db->unit);
 	printf("0x%x at 0x%x by 0x%x, max_ent=0x%x\n",
 	       incode, finchar, db->dict[finchar].cptr, max_ent);
     } else if (dictp->codem1 != finchar-1) {
 	printf("bsd_decomp%d: bad code chain 0x%x finchar=0x%x ",
 	       db->unit, incode, finchar);
 	printf("oldcode=0x%x cptr=0x%x codem1=0x%x\n", oldcode,
 	       db->dict[finchar].cptr, dictp->codem1);
+    }
     m_freem(mret);
     return DECOMP_FATALERROR;
 #endif /* DEBUG */
+}
 MODULE(MODULE_CLASS_MISC, ppp_bsdcomp, NULL);
 static int
 ppp_bsdcomp_modcmd(modcmd_t cmd, void *arg)
+{
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		return ppp_register_compressor(&ppp_bsd_compress);
 	case MODULE_CMD_FINI:
 		return ppp_unregister_compressor(&ppp_bsd_compress);
 	case MODULE_CMD_STAT:
 		return 0;
 	default:
 		return ENOTTY;
+	}
 	return ENOTTY;
+}
 #endif /* DO_BSD_COMPRESS */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ppp.c,v 1.124 2008/11/07 00:20:13 dyoung Exp $	*/
+/*	$NetBSD: if_ppp.c,v 1.125 2008/11/25 02:40:36 cube Exp $	*/
 /*	Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp 	*/
 /*
  * if_ppp.c - Point-to-Point Protocol (PPP) Asynchronous driver.
+ *
  * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -92,48 +92,50 @@
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 /*
  * XXX IMP ME HARDER
+ *
  * This is an explanation of that comment.  This code used to use
  * splimp() to block both network and tty interrupts.  However,
  * that call is deprecated.  So, we have replaced the uses of
  * splimp() with splhigh() in order to applomplish what it needs
  * to accomplish, and added that happy little comment.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.124 2008/11/07 00:20:13 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.125 2008/11/25 02:40:36 cube Exp $");
 #include "ppp.h"
 #include "opt_inet.h"
 #include "opt_gateway.h"
 #include "opt_ppp.h"
 #ifdef INET
 #define VJC
 #endif
 #define PPP_COMPRESS
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
 #include <sys/intr.h>
 #include <sys/simplelock.h>
 #include <sys/socketvar.h>
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
 #include <net/route.h>
 #ifdef PPP_FILTER
 #include <net/bpf.h>
 #endif
 @@ -204,59 +206,46 @@ static void	pppintr(void *);
 static int		ppp_clone_create(struct if_clone *, int);
 static int		ppp_clone_destroy(struct ifnet *);
 static struct ppp_softc *ppp_create(const char *, int);
 static LIST_HEAD(, ppp_softc) ppp_softc_list;
 struct if_clone ppp_cloner =
     IF_CLONE_INITIALIZER("ppp", ppp_clone_create, ppp_clone_destroy);
 static struct simplelock ppp_list_mutex = SIMPLELOCK_INITIALIZER;
 #ifdef PPP_COMPRESS
-/*
+static LIST_HEAD(, compressor) ppp_compressors = { NULL };
- * List of compressors we know about.
+static kmutex_t ppp_compressors_mtx;
  * We leave some space so maybe we can modload compressors.
  */
-extern struct compressor ppp_bsd_compress;
+static struct compressor *ppp_get_compressor(uint8_t);
 extern struct compressor ppp_deflate, ppp_deflate_draft;
 struct compressor *ppp_compressors[PPP_COMPRESSORS_MAX] = {
 #if DO_BSD_COMPRESS && defined(PPP_BSDCOMP)
     &ppp_bsd_compress,
 #endif
 #if DO_DEFLATE && defined(PPP_DEFLATE)
     &ppp_deflate,
     &ppp_deflate_draft,
 #endif
     NULL
 };
 #endif /* PPP_COMPRESS */
 /*
  * Called from boot code to establish ppp interfaces.
  */
 void
 pppattach(void)
+{
     extern struct linesw ppp_disc;
     if (ttyldisc_attach(&ppp_disc) != 0)
     	panic("pppattach");
     LIST_INIT(&ppp_softc_list);
     if_clone_attach(&ppp_cloner);
     mutex_init(&ppp_compressors_mtx, MUTEX_DEFAULT, IPL_NONE);
+}
 static struct ppp_softc *
 ppp_create(const char *name, int unit)
+{
     struct ppp_softc *sc, *sci, *scl = NULL;
     MALLOC(sc, struct ppp_softc *, sizeof(*sc), M_DEVBUF, M_WAIT|M_ZERO);
     simple_lock(&ppp_list_mutex);
     if (unit == -1) {
 	int i = 0;
 	LIST_FOREACH(sci, &ppp_softc_list, sc_iflist) {
 @@ -477,27 +466,27 @@ pppdealloc(struct ppp_softc *sc)
     (void)ppp_clone_destroy(&sc->sc_if);
+}
 /*
  * Ioctl routine for generic ppp devices.
  */
 int
 pppioctl(struct ppp_softc *sc, u_long cmd, void *data, int flag,
     struct lwp *l)
+{
     int s, error, flags, mru, npx;
     u_int nb;
     struct ppp_option_data *odp;
-    struct compressor **cp;
+    struct compressor *cp;
     struct npioctl *npi;
     time_t t;
 #ifdef PPP_FILTER
     struct bpf_program *bp, *nbp;
     struct bpf_insn *newcode, *oldcode;
     int newcodelen;
 #endif /* PPP_FILTER */
 #ifdef	PPP_COMPRESS
     u_char ccp_option[CCP_MAX_OPTION_LENGTH];
 #endif
     switch (cmd) {
     case PPPIOCSFLAGS:
 @@ -585,71 +574,75 @@ pppioctl(struct ppp_softc *sc, u_long cm
 	sc->sc_xfer = l->l_proc->p_pid;
 	break;
 #ifdef PPP_COMPRESS
     case PPPIOCSCOMPRESS:
 	odp = (struct ppp_option_data *) data;
 	nb = odp->length;
 	if (nb > sizeof(ccp_option))
 	    nb = sizeof(ccp_option);
 	if ((error = copyin(odp->ptr, ccp_option, nb)) != 0)
 	    return (error);
 	if (ccp_option[1] < 2)	/* preliminary check on the length byte */
 	    return (EINVAL);
-	for (cp = ppp_compressors; *cp != NULL; ++cp)
+	cp = ppp_get_compressor(ccp_option[0]);
-	    if ((*cp)->compress_proto == ccp_option[0]) {
+	if (cp == NULL) {
-		/*
+		if (sc->sc_flags & SC_DEBUG)
-		 * Found a handler for the protocol - try to allocate
+		    printf("%s: no compressor for [%x %x %x], %x\n",
-		 * a compressor or decompressor.
+			sc->sc_if.if_xname, ccp_option[0], ccp_option[1],
-		 */
+			ccp_option[2], nb);
-		error = 0;
+		return (EINVAL);	/* no handler found */
 		if (odp->transmit) {
-		    s = splsoftnet();
+	/*
-		    if (sc->sc_xc_state != NULL)
+	 * Found a handler for the protocol - try to allocate
-			(*sc->sc_xcomp->comp_free)(sc->sc_xc_state);
+	 * a compressor or decompressor.
-		    sc->sc_xcomp = *cp;
+	 */
-		    sc->sc_xc_state = (*cp)->comp_alloc(ccp_option, nb);
+	error = 0;
-		    if (sc->sc_xc_state == NULL) {
+	if (odp->transmit) {
-			if (sc->sc_flags & SC_DEBUG)
+	    s = splsoftnet();
-			    printf("%s: comp_alloc failed\n",
+	    if (sc->sc_xc_state != NULL) {
-				sc->sc_if.if_xname);
+		(*sc->sc_xcomp->comp_free)(sc->sc_xc_state);
-			error = ENOBUFS;
+		module_rele(sc->sc_xcomp->comp_name);
 		    splhigh();	/* XXX IMP ME HARDER */
 		    sc->sc_flags &= ~SC_COMP_RUN;
 		    splx(s);
 		} else {
 		    s = splsoftnet();
 		    if (sc->sc_rc_state != NULL)
 			(*sc->sc_rcomp->decomp_free)(sc->sc_rc_state);
 		    sc->sc_rcomp = *cp;
 		    sc->sc_rc_state = (*cp)->decomp_alloc(ccp_option, nb);
 		    if (sc->sc_rc_state == NULL) {
 			if (sc->sc_flags & SC_DEBUG)
 			    printf("%s: decomp_alloc failed\n",
 				sc->sc_if.if_xname);
 			error = ENOBUFS;
 		    splhigh();	/* XXX IMP ME HARDER */
 		    sc->sc_flags &= ~SC_DECOMP_RUN;
 		    splx(s);
 		return (error);
+	    }
-	if (sc->sc_flags & SC_DEBUG)
+	    sc->sc_xcomp = cp;
-	    printf("%s: no compressor for [%x %x %x], %x\n",
+	    sc->sc_xc_state = cp->comp_alloc(ccp_option, nb);
-		sc->sc_if.if_xname, ccp_option[0], ccp_option[1],
+	    if (sc->sc_xc_state == NULL) {
-		ccp_option[2], nb);
+		if (sc->sc_flags & SC_DEBUG)
-	return (EINVAL);	/* no handler found */
+		    printf("%s: comp_alloc failed\n",
 			sc->sc_if.if_xname);
 		error = ENOBUFS;
+	    }
 	    splhigh();	/* XXX IMP ME HARDER */
 	    sc->sc_flags &= ~SC_COMP_RUN;
 	    splx(s);
 	} else {
 	    s = splsoftnet();
 	    if (sc->sc_rc_state != NULL) {
 		(*sc->sc_rcomp->decomp_free)(sc->sc_rc_state);
 		module_rele(sc->sc_rcomp->comp_name);
+	    }
 	    sc->sc_rcomp = cp;
 	    sc->sc_rc_state = cp->decomp_alloc(ccp_option, nb);
 	    if (sc->sc_rc_state == NULL) {
 		if (sc->sc_flags & SC_DEBUG)
 		    printf("%s: decomp_alloc failed\n",
 			sc->sc_if.if_xname);
 		error = ENOBUFS;
+	    }
 	    splhigh();	/* XXX IMP ME HARDER */
 	    sc->sc_flags &= ~SC_DECOMP_RUN;
 	    splx(s);
+	}
 	return (error);
 #endif /* PPP_COMPRESS */
     case PPPIOCGNPMODE:
     case PPPIOCSNPMODE:
 	npi = (struct npioctl *) data;
 	switch (npi->protocol) {
 	case PPP_IP:
 	    npx = NP_IP;
 	    break;
 	case PPP_IPV6:
 	    npx = NP_IPV6;
 	    break;
 	default:
 @@ -1381,30 +1374,32 @@ ppp_ccp(struct ppp_softc *sc, struct mbu
+	}
 	break;
+    }
+}
 /*
  * CCP is down; free (de)compressor state if necessary.
  */
 static void
 ppp_ccp_closed(struct ppp_softc *sc)
+{
     if (sc->sc_xc_state) {
 	(*sc->sc_xcomp->comp_free)(sc->sc_xc_state);
 	module_rele(sc->sc_xcomp->comp_name);
 	sc->sc_xc_state = NULL;
+    }
     if (sc->sc_rc_state) {
 	(*sc->sc_rcomp->decomp_free)(sc->sc_rc_state);
 	module_rele(sc->sc_rcomp->comp_name);
 	sc->sc_rc_state = NULL;
+    }
+}
 #endif /* PPP_COMPRESS */
 /*
  * PPP packet input routine.
  * The caller has checked and removed the FCS and has inserted
  * the address/control bytes and the protocol high byte if they
  * were omitted.
  */
 void
 ppppktin(struct ppp_softc *sc, struct mbuf *m, int lost)
 @@ -1769,13 +1764,92 @@ done:
 /*
  * a wrapper to transmit a packet from if_start since ALTQ uses
  * if_start to send a packet.
  */
 static void
 ppp_ifstart(struct ifnet *ifp)
+{
 	struct ppp_softc *sc;
 	sc = ifp->if_softc;
 	(*sc->sc_start)(sc);
+}
 #endif
 static const struct ppp_known_compressor {
 	uint8_t code;
 	const char *module;
 } ppp_known_compressors[] = {
 	{ CI_DEFLATE, "ppp_deflate" },
 	{ CI_DEFLATE_DRAFT, "ppp_deflate" },
 	{ CI_BSD_COMPRESS, "ppp_bsdcomp" },
 	{ CI_MPPE, "ppp_mppe" },
 	{ 0, NULL }
 };
 static struct compressor *
 ppp_get_compressor_noload(uint8_t ci, bool hold)
+{
 	struct compressor *cp;
 	mutex_enter(&ppp_compressors_mtx);
 	LIST_FOREACH(cp, &ppp_compressors, comp_list) {
 		if (cp->compress_proto == ci) {
 			mutex_exit(&ppp_compressors_mtx);
 			if (hold && module_hold(cp->comp_name) != 0)
 				return NULL;
 			return cp;
+		}
+	}
 	mutex_exit(&ppp_compressors_mtx);
 	return NULL;
+}
 static struct compressor *
 ppp_get_compressor(uint8_t ci)
+{
 	struct compressor *cp;
 	const struct ppp_known_compressor *pkc;
 	if ((cp = ppp_get_compressor_noload(ci, true)) != NULL)
 		return cp;
 	/* Not found, so try to autoload a module */
 	for (pkc = ppp_known_compressors; pkc->module != NULL; pkc++) {
 		if (pkc->code == ci) {
 			if (module_autoload(pkc->module, MODULE_CLASS_MISC))
 				break;
 			return ppp_get_compressor_noload(ci, true);
+		}
+	}
 	return NULL;
+}
 int
 ppp_register_compressor(struct compressor *pc)
+{
 	if (ppp_get_compressor_noload(pc->compress_proto, false) != NULL)
 		return EEXIST;
 	mutex_enter(&ppp_compressors_mtx);
 	LIST_INSERT_HEAD(&ppp_compressors, pc, comp_list);
 	mutex_exit(&ppp_compressors_mtx);
 	return 0;
+}
 int
 ppp_unregister_compressor(struct compressor *pc)
+{
 	if (ppp_get_compressor_noload(pc->compress_proto, false) != pc)
 		return ENOENT;
 	mutex_enter(&ppp_compressors_mtx);
 	LIST_REMOVE(pc, comp_list);
 	mutex_exit(&ppp_compressors_mtx);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ppp-comp.h,v 1.14 2008/02/20 17:05:53 matt Exp $	*/
+/*	$NetBSD: ppp-comp.h,v 1.15 2008/11/25 02:40:36 cube Exp $	*/
 /*
  * ppp-comp.h - Definitions for doing PPP packet compression.
+ *
  * Copyright (c) 1989-2002 Paul Mackerras. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
 @@ -52,26 +52,28 @@
 #define DO_PREDICTOR_2	0
 /*
  * How many entries to make available in the compressors table
  */
 #ifndef PPP_COMPRESSORS_MAX
 #define PPP_COMPRESSORS_MAX	8
 #endif
 /*
  * Structure giving methods for compression/decompression.
  */
 #ifdef PACKETPTR
 #include <sys/queue.h>
 struct compressor {
 	int	compress_proto;	/* CCP compression protocol number */
 	/* Allocate space for a compressor (transmit side) */
 	void	*(*comp_alloc)(u_char *, int);
 	/* Free space used by a compressor */
 	void	(*comp_free)(void *);
 	/* Initialize a compressor */
 	int	(*comp_init)(void *, u_char *, int, int, int, int);
 	/* Reset a compressor */
 	void	(*comp_reset)(void *);
 	/* Compress a packet */
 	int	(*compress)(void *, PACKETPTR *, PACKETPTR, int, int);
 @@ -82,26 +84,29 @@ struct compressor {
 	void	*(*decomp_alloc)(u_char *, int);
 	/* Free space used by a decompressor */
 	void	(*decomp_free)(void *);
 	/* Initialize a decompressor */
 	int	(*decomp_init)(void *, u_char *, int, int, int, int, int);
 	/* Reset a decompressor */
 	void	(*decomp_reset)(void *);
 	/* Decompress a packet. */
 	int	(*decompress)(void *, PACKETPTR, PACKETPTR *);
 	/* Update state for an incompressible packet received */
 	void	(*incomp)(void *, PACKETPTR);
 	/* Return decompression statistics */
 	void	(*decomp_stat)(void *, struct compstat *);
 	LIST_ENTRY(compressor)	comp_list;
 	const char *comp_name;
 };
 #endif /* PACKETPTR */
 /*
  * Return values for decompress routine.
  * We need to make these distinctions so that we can disable certain
  * useful functionality, namely sending a CCP reset-request as a result
  * of an error detected after decompression.  This is to avoid infringing
  * a patent held by Motorola.
  * Don't you just lurve software patents.
  */
 #define DECOMP_OK		0	/* everything went OK */
 #define DECOMP_ERROR		1	/* error detected before decomp. */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ppp-deflate.c,v 1.17 2008/05/05 13:41:30 ad Exp $	*/
+/*	$NetBSD: ppp-deflate.c,v 1.18 2008/11/25 02:40:36 cube Exp $	*/
 /*	Id: ppp-deflate.c,v 1.5 1997/03/04 03:33:28 paulus Exp 	*/
 /*
  * ppp_deflate.c - interface the zlib procedures for Deflate compression
  * and decompression (as used by gzip) to the PPP code.
  * This version is for use with mbufs on BSD-derived systems.
+ *
  * Copyright (c) 1989-2002 Paul Mackerras. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
 @@ -29,32 +29,35 @@
  *    "This product includes software developed by Paul Mackerras
  *     <paulus@samba.org>".
+ *
  * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
  * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
  * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppp-deflate.c,v 1.17 2008/05/05 13:41:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppp-deflate.c,v 1.18 2008/11/25 02:40:36 cube Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <net/if.h>
 #include <net/ppp_defs.h>
 #include <net/if_ppp.h>
 #include <net/zlib.h>
 #define PACKETPTR	struct mbuf *
 #include <net/ppp-comp.h>
 #if DO_DEFLATE
 #define DEFLATE_DEBUG	1
 /*
  * State for a Deflate (de)compressor.
  */
 struct deflate_state {
 @@ -82,58 +85,60 @@ static int	z_decomp_init(void *state, u_
 			      int unit, int hdrlen, int mru, int debug);
 static int	z_compress(void *state, struct mbuf **mret,
 			   struct mbuf *mp, int slen, int maxolen);
 static void	z_incomp(void *state, struct mbuf *dmsg);
 static int	z_decompress(void *state, struct mbuf *cmp,
 			     struct mbuf **dmpp);
 static void	z_comp_reset(void *state);
 static void	z_decomp_reset(void *state);
 static void	z_comp_stats(void *state, struct compstat *stats);
 /*
  * Procedures exported to if_ppp.c.
  */
-struct compressor ppp_deflate = {
+static struct compressor ppp_deflate = {
-    CI_DEFLATE,			/* compress_proto */
+    .compress_proto =	CI_DEFLATE,
-    z_comp_alloc,		/* comp_alloc */
+    .comp_alloc =	z_comp_alloc,
-    z_comp_free,		/* comp_free */
+    .comp_free =	z_comp_free,
-    z_comp_init,		/* comp_init */
+    .comp_init =	z_comp_init,
-    z_comp_reset,		/* comp_reset */
+    .comp_reset =	z_comp_reset,
-    z_compress,			/* compress */
+    .compress =		z_compress,
-    z_comp_stats,		/* comp_stat */
+    .comp_stat =	z_comp_stats,
-    z_decomp_alloc,		/* decomp_alloc */
+    .decomp_alloc =	z_decomp_alloc,
-    z_decomp_free,		/* decomp_free */
+    .decomp_free =	z_decomp_free,
-    z_decomp_init,		/* decomp_init */
+    .decomp_init =	z_decomp_init,
-    z_decomp_reset,		/* decomp_reset */
+    .decomp_reset =	z_decomp_reset,
-    z_decompress,		/* decompress */
+    .decompress =	z_decompress,
-    z_incomp,			/* incomp */
+    .incomp =		z_incomp,
-    z_comp_stats,		/* decomp_stat */
+    .decomp_stat =	z_comp_stats,
     .comp_name =	"ppp_deflate"
 };
-struct compressor ppp_deflate_draft = {
+static struct compressor ppp_deflate_draft = {
-    CI_DEFLATE_DRAFT,		/* compress_proto */
+    .compress_proto =	CI_DEFLATE_DRAFT,
-    z_comp_alloc,		/* comp_alloc */
+    .comp_alloc =	z_comp_alloc,
-    z_comp_free,		/* comp_free */
+    .comp_free =	z_comp_free,
-    z_comp_init,		/* comp_init */
+    .comp_init =	z_comp_init,
-    z_comp_reset,		/* comp_reset */
+    .comp_reset =	z_comp_reset,
-    z_compress,			/* compress */
+    .compress =		z_compress,
-    z_comp_stats,		/* comp_stat */
+    .comp_stat =	z_comp_stats,
-    z_decomp_alloc,		/* decomp_alloc */
+    .decomp_alloc =	z_decomp_alloc,
-    z_decomp_free,		/* decomp_free */
+    .decomp_free =	z_decomp_free,
-    z_decomp_init,		/* decomp_init */
+    .decomp_init =	z_decomp_init,
-    z_decomp_reset,		/* decomp_reset */
+    .decomp_reset =	z_decomp_reset,
-    z_decompress,		/* decompress */
+    .decompress =	z_decompress,
-    z_incomp,			/* incomp */
+    .incomp =		z_incomp,
-    z_comp_stats,		/* decomp_stat */
+    .decomp_stat =	z_comp_stats,
     .comp_name =	"ppp_deflate"
 };
 /*
  * Space allocation and freeing routines for use by zlib routines.
  */
 void *
 zalloc(void *notused, u_int items, u_int size)
+{
     void *ptr;
     ptr = malloc(items * size, M_DEVBUF, M_NOWAIT);
     return ptr;
+}
 @@ -654,14 +659,43 @@ z_incomp(void *arg, struct mbuf *mi)
 	state->strm.avail_in = mi->m_len;
 	rlen += mi->m_len;
+    }
     /*
      * Update stats.
      */
     state->stats.inc_bytes += rlen;
     state->stats.inc_packets++;
     state->stats.unc_bytes += rlen;
     state->stats.unc_packets++;
+}
 MODULE(MODULE_CLASS_MISC, ppp_deflate, NULL);
 static int
 ppp_deflate_modcmd(modcmd_t cmd, void *arg)
+{
 	int error, error1;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		if ((error = ppp_register_compressor(&ppp_deflate)) != 0)
 			return error;
 		if ((error =
 		    ppp_register_compressor(&ppp_deflate_draft)) != 0)
 			(void)ppp_unregister_compressor(&ppp_deflate);
 		return error;
 	case MODULE_CMD_FINI:
 		error = ppp_unregister_compressor(&ppp_deflate);
 		error1 = ppp_unregister_compressor(&ppp_deflate_draft);
 		if (error)
 			return error;
 		return error1;
 	case MODULE_CMD_STAT:
 		return 0;
 	default:
 		return ENOTTY;
+	}
 	return ENOTTY;
+}
 #endif /* DO_DEFLATE */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ppp.h,v 1.23 2005/12/11 23:05:25 thorpej Exp $	*/
+/*	$NetBSD: if_ppp.h,v 1.24 2008/11/25 02:40:36 cube Exp $	*/
 /*	Id: if_ppp.h,v 1.16 1997/04/30 05:46:04 paulus Exp 	*/
 /*
  * if_ppp.h - Point-to-Point Protocol definitions.
+ *
  * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -163,15 +163,19 @@ struct ppp_rawin {
 /*
  * These two are interface ioctls so that pppstats can do them on
  * a socket without having to open the serial device.
  */
 #define SIOCGPPPSTATS	_IOWR('i', 123, struct ifpppstatsreq)
 #define SIOCGPPPCSTATS	_IOWR('i', 122, struct ifpppcstatsreq)
 #if !defined(ifr_mtu)
 #define ifr_mtu	ifr_ifru.ifru_metric
 #endif
 #if defined(_KERNEL) || defined(KERNEL)
 void	pppattach(void);
 struct compressor;
 int	ppp_register_compressor(struct compressor *);
 int	ppp_unregister_compressor(struct compressor *);
 #endif
 #endif /* !_NET_IF_PPP_H_ */