make sure pppd notices hangups in demand mode

[ppp.git] / linux / ppp.c

diff --git a/linux/ppp.c b/linux/ppp.c
index 777afa793ab73d84ffa43e243bdaa5144840bf91..8cc2727179ff912ee64c66f4de3907d26a33b87e 100644 (file)
--- a/linux/ppp.c
+++ b/linux/ppp.c
@@ -4,7 +4,7 @@
  *  Al Longyear <longyear@netcom.com>
  *  Extensively rewritten by Paul Mackerras <paulus@cs.anu.edu.au>
  *
- *  ==FILEVERSION 990325==
+ *  ==FILEVERSION 990412==
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the number above to the
@@ -45,7 +45,7 @@
 
 #define PPP_MAX_RCV_QLEN       32      /* max # frames we queue up for pppd */
 
-/* $Id: ppp.c,v 1.22 1999/03/30 06:33:07 paulus Exp $ */
+/* $Id: ppp.c,v 1.25 1999/04/16 11:29:13 paulus Exp $ */
 
 #include <linux/version.h>
 #include <linux/config.h>
@@ -104,7 +104,7 @@
 #endif
 
 #undef PPP_VERSION
-#define PPP_VERSION    "2.3.6"
+#define PPP_VERSION    "2.3.7"
 
 #if LINUX_VERSION_CODE >= VERSION(2,1,4)
 
@@ -552,6 +552,7 @@ ppp_tty_close (struct tty_struct *tty)
                ppp->tty = ppp->backup_tty;
                if (ppp_tty_push(ppp))
                        ppp_output_wakeup(ppp);
+               wake_up_interruptible(&ppp->read_wait);
        } else {
                ppp->tty = 0;
                ppp->sc_xfer = 0;
@@ -1526,7 +1527,7 @@ ppp_tty_receive (struct tty_struct *tty, const __u8 * data,
                        ppp->toss = 0xC0;
                        if (ppp->flags & SC_DEBUG)
                                printk(KERN_DEBUG "rcv frame too long: "
-                                      "len=%ld mru=%d hroom=%d troom=%d\n",
+                                      "len=%d mru=%d hroom=%d troom=%d\n",
                                       skb->len, ppp->mru, skb_headroom(skb),
                                       skb_tailroom(skb));
                        continue;