From: Paul Mackerras <paulus@samba.org>
Date: Mon, 1 May 1995 01:39:33 +0000 (+0000)
Subject: only ref ppp_bsd_compress if DO_BSD_COMPRESS; hdrlen param to comp_init
X-Git-Tag: RELEASE_2_3_6~735
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=614af03b75ed9bdca2b5fcc4761842ba345cd260;hp=ca37fc1452ca1ae6e47e52bea31ffa8ed2d970f4

only ref ppp_bsd_compress if DO_BSD_COMPRESS; hdrlen param to comp_init
---

diff --git a/freebsd-2.0/if_ppp.c b/freebsd-2.0/if_ppp.c
index 4e0b88b..e75691f 100644
--- a/freebsd-2.0/if_ppp.c
+++ b/freebsd-2.0/if_ppp.c
@@ -69,7 +69,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: if_ppp.c,v 1.2 1995/04/28 06:19:34 paulus Exp $ */
+/* $Id: if_ppp.c,v 1.3 1995/05/01 01:39:33 paulus Exp $ */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 
 #include "ppp.h"
@@ -168,7 +168,9 @@ static void	pppdumpm __P((struct mbuf *m0));
 extern struct compressor ppp_bsd_compress;
 
 struct compressor *ppp_compressors[8] = {
+#if DO_BSD_COMPRESS
     &ppp_bsd_compress,
+#endif
     NULL
 };
 #endif /* PPP_COMPRESS */
@@ -986,7 +988,7 @@ ppp_ccp(sc, m, rcvd)
 		if (sc->sc_xc_state != NULL
 		    && (*sc->sc_xcomp->comp_init)
 			(sc->sc_xc_state, dp + CCP_HDRLEN, slen - CCP_HDRLEN,
-			 sc->sc_if.if_unit, sc->sc_flags & SC_DEBUG)) {
+			 sc->sc_if.if_unit, 0, sc->sc_flags & SC_DEBUG)) {
 		    s = splimp();
 		    sc->sc_flags |= SC_COMP_RUN;
 		    splx(s);
diff --git a/ultrix/if_ppp.c b/ultrix/if_ppp.c
index 9bfd22d..63e99d3 100644
--- a/ultrix/if_ppp.c
+++ b/ultrix/if_ppp.c
@@ -72,7 +72,7 @@
  * Robert Olsson <robert@robur.slu.se> and Paul Mackerras.
  */
 
-/* $Id: if_ppp.c,v 1.5 1994/12/13 03:24:47 paulus Exp $ */
+/* $Id: if_ppp.c,v 1.6 1995/05/01 01:39:03 paulus Exp $ */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 
 #include "ppp.h"
@@ -169,7 +169,9 @@ static u_short interactive_ports[8] = {
 extern struct compressor ppp_bsd_compress;
 
 struct compressor *ppp_compressors[] = {
+#if DO_BSD_COMPRESS
     &ppp_bsd_compress,
+#endif
     NULL
 };
 #endif /* PPP_COMPRESS */
@@ -996,7 +998,7 @@ ppp_ccp(sc, m, rcvd)
 		if (sc->sc_xc_state != NULL
 		    && (*sc->sc_xcomp->comp_init)
 			(sc->sc_xc_state, dp + CCP_HDRLEN, slen - CCP_HDRLEN,
-			 sc->sc_if.if_unit, sc->sc_flags & SC_DEBUG)) {
+			 sc->sc_if.if_unit, 0, sc->sc_flags & SC_DEBUG)) {
 		    s = splimp();
 		    sc->sc_flags |= SC_COMP_RUN;
 		    splx(s);