diff options
| author | peter <peter@FreeBSD.org> | 1998-06-20 16:28:04 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-06-20 16:28:04 +0000 |
| commit | 30f088ad7bc38164fba1bda3e8d767e2ab1959de (patch) | |
| tree | f09607f67b8a4413266b0305a3f43edfc161f554 /sys/net/if_ppp.c | |
| parent | cbd53d5292744ee755bbcd55babd276ab31a50d1 (diff) | |
| download | FreeBSD-src-30f088ad7bc38164fba1bda3e8d767e2ab1959de.zip FreeBSD-src-30f088ad7bc38164fba1bda3e8d767e2ab1959de.tar.gz | |
Merge ppp changes from 2.3.3 -> 2.3.5. I have spotted some more
problems, which I'll have a go at shortly.
Diffstat (limited to 'sys/net/if_ppp.c')
| -rw-r--r-- | sys/net/if_ppp.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index 8bbec24..6068f47 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -69,7 +69,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $Id: if_ppp.c,v 1.57 1998/05/19 14:04:09 dg Exp $ */ +/* $Id: if_ppp.c,v 1.58 1998/06/07 17:12:03 dfr Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ @@ -183,10 +183,7 @@ static void pppdumpm __P((struct mbuf *m0)); */ extern struct compressor ppp_bsd_compress; -extern struct compressor ppp_deflate; -#ifdef CI_BADDEFLATE -extern struct compressor ppp_baddeflate; -#endif +extern struct compressor ppp_deflate, ppp_deflate_draft; static struct compressor *ppp_compressors[8] = { #if DO_BSD_COMPRESS && defined(PPP_BSDCOMP) @@ -194,9 +191,7 @@ static struct compressor *ppp_compressors[8] = { #endif #if DO_DEFLATE && defined(PPP_DEFLATE) &ppp_deflate, -#ifdef CI_BADDEFLATE - &ppp_baddeflate, -#endif + &ppp_deflate_draft, #endif NULL }; |
