From d465daac1ee613ba6bf83ee481d35be77b939b41 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Tue, 25 Mar 1997 22:33:25 +0000
Subject: [PATCH] make sure that the tty layer restarts the ppp layer when
 there is an error such as out of buffer space.

---
 sys/net/ppp_tty.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index b7d3cd75bcdd..3ddbf468f7a0 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ppp_tty.c,v 1.12 1997/03/24 21:23:10 christos Exp $	*/
+/*	$NetBSD: ppp_tty.c,v 1.13 1997/03/25 22:33:25 christos Exp $	*/
 /*	Id: ppp_tty.c,v 1.3 1996/07/01 01:04:11 paulus Exp 	*/
 
 /*
@@ -119,7 +119,7 @@ int	pppwrite __P((struct tty *tp, struct uio *uio, int flag));
 int	ppptioctl __P((struct tty *tp, u_long cmd, caddr_t data, int flag,
 		       struct proc *));
 int	pppinput __P((int c, struct tty *tp));
-int	pppstart __P((struct tty *tp));
+int	pppstart __P((struct tty *tp, int));
 
 static u_int16_t pppfcs __P((u_int16_t fcs, u_char *cp, int len));
 static void	pppasyncstart __P((struct ppp_softc *));
@@ -664,7 +664,7 @@ pppasyncstart(sc)
 
     /* Call pppstart to start output again if necessary. */
     s = spltty();
-    pppstart(tp);
+    pppstart(tp, 0);
 
     /*
      * This timeout is needed for operation on a pseudo-tty,
@@ -705,8 +705,9 @@ pppasyncctlp(sc)
  * Called at spltty or higher.
  */
 int
-pppstart(tp)
+pppstart(tp, force)
     register struct tty *tp;
+    int force;
 {
     register struct ppp_softc *sc = (struct ppp_softc *) tp->t_sc;
 
@@ -722,8 +723,9 @@ pppstart(tp)
      * or been disconnected from the ppp unit, then tell if_ppp.c that
      * we need more output.
      */
-    if (CCOUNT(&tp->t_outq) < PPP_LOWAT
-	&& !((tp->t_state & TS_CARR_ON) == 0 && (tp->t_cflag & CLOCAL) == 0)
+    if (CCOUNT(&tp->t_outq) >= PPP_LOWAT && !force)
+	return 0;
+    if (!((tp->t_state & TS_CARR_ON) == 0 && (tp->t_cflag & CLOCAL) == 0)
 	&& sc != NULL && tp == (struct tty *) sc->sc_devp) {
 	ppp_restart(sc);
     }
@@ -744,7 +746,7 @@ ppp_timeout(x)
 
     s = spltty();
     sc->sc_flags &= ~SC_TIMEOUT;
-    pppstart(tp);
+    pppstart(tp, 1);
     splx(s);
 }