Update kernel parts of ppp to ppp-2.3.3. Not much has changed except

that the deflate components use zlib 1.0.4 instead of zlib 0.95.

1 files changed, 4 insertions, 7 deletions

diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c
index a3f8423..08d1f22 100644
--- a/sys/net/ppp_deflate.c
+++ b/sys/net/ppp_deflate.c
@@ -1,4 +1,4 @@
-/*	$Id: ppp_deflate.c,v 1.5 1997/09/21 22:31:20 dyson Exp $	*/
+/*	$Id: ppp_deflate.c,v 1.6 1997/10/28 15:58:32 bde Exp $	*/
 
 /*
  * ppp_deflate.c - interface the zlib procedures for Deflate compression
@@ -60,7 +60,7 @@ struct deflate_state {
 #define DEFLATE_OVHD	2		/* Deflate overhead/packet */
 
 static void	*z_alloc __P((void *, u_int items, u_int size));
-static void	z_free __P((void *, void *ptr, u_int nb));
+static void	z_free __P((void *, void *ptr));
 static void	*z_comp_alloc __P((u_char *options, int opt_len));
 static void	*z_decomp_alloc __P((u_char *options, int opt_len));
 static void	z_comp_free __P((void *state));
@@ -113,10 +113,9 @@ z_alloc(notused, items, size)
 }
 
 void
-z_free(notused, ptr, nbytes)
+z_free(notused, ptr)
     void *notused;
     void *ptr;
-    u_int nbytes;
 {
     FREE(ptr, M_DEVBUF);
 }
@@ -148,10 +147,9 @@ z_comp_alloc(options, opt_len)
 
     state->strm.next_in = NULL;
     state->strm.zalloc = z_alloc;
-    state->strm.zalloc_init = z_alloc;
     state->strm.zfree = z_free;
     if (deflateInit2(&state->strm, Z_DEFAULT_COMPRESSION, DEFLATE_METHOD_VAL,
-		     -w_size, 8, Z_DEFAULT_STRATEGY, DEFLATE_OVHD+2) != Z_OK) {
+		     -w_size, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
 	FREE(state, M_DEVBUF);
 	return NULL;
     }
@@ -380,7 +378,6 @@ z_decomp_alloc(options, opt_len)
 
     state->strm.next_out = NULL;
     state->strm.zalloc = z_alloc;
-    state->strm.zalloc_init = z_alloc;
     state->strm.zfree = z_free;
     if (inflateInit2(&state->strm, -w_size) != Z_OK) {
 	FREE(state, M_DEVBUF);