From 9acc846078259301e475f53f7cfdcf655f34c442 Mon Sep 17 00:00:00 2001
From: Brian Somers <brian@FreeBSD.org>
Date: Mon, 13 Dec 1999 18:45:21 +0000
Subject: [PATCH] Handle PPPoPTY correctly.

---
 usr.sbin/ppp/tty.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/ppp/tty.c b/usr.sbin/ppp/tty.c
index 13e7a1a0c6cf..df6029cdc2ce 100644
--- a/usr.sbin/ppp/tty.c
+++ b/usr.sbin/ppp/tty.c
@@ -113,6 +113,7 @@ tty_Timeout(void *data)
         log_Printf(LogWARN, "%s: Carrier ioctl not supported, "
                    "using ``set cd off''\n", p->link.name);
       timer_Stop(&dev->Timer);
+      dev->mbits = TIOCM_CD;
       return;
     }
   } else
@@ -188,8 +189,7 @@ tty_AwaitCarrier(struct physical *p)
     return CARRIER_PENDING;			/* Not yet ! */
   }
 
-  return Online(dev) || !dev->dev.cd.necessity == CD_REQUIRED ?
-    CARRIER_OK : CARRIER_LOST;
+  return Online(dev) ? CARRIER_OK : CARRIER_LOST;
 }
 
 static int