summaryrefslogtreecommitdiffstats
path: root/sys/net
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>1995-02-13 02:09:14 +0000
committerache <ache@FreeBSD.org>1995-02-13 02:09:14 +0000
commit894f4ade91e97ca19c8958cef685cbe7f3bcebbb (patch)
tree9ba15dd43cdc0970ead32766610fc6b728c45090 /sys/net
parent1afa2e839193b2e77a207ba0fe4127a0b102c5ba (diff)
downloadFreeBSD-src-894f4ade91e97ca19c8958cef685cbe7f3bcebbb.zip
FreeBSD-src-894f4ade91e97ca19c8958cef685cbe7f3bcebbb.tar.gz
*close: just purge tty queues if we can't drain them
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if_ppp.c5
-rw-r--r--sys/net/if_sl.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 3f4ca74..0208022 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.8 1994/11/26 19:23:59 bde Exp $ */
+/* $Id: if_ppp.c,v 1.9 1994/11/27 15:29:56 bde Exp $ */
/* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
#include "ppp.h"
@@ -347,7 +347,8 @@ pppclose(tp, flag)
struct mbuf *m;
int s;
- ttywflush(tp);
+ if (ttywflush(tp))
+ ttyflush(tp, FREAD | FWRITE);
s = splimp(); /* paranoid; splnet probably ok */
clist_free_cblocks(&tp->t_outq);
tp->t_line = 0;
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 2812284..323d52c 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if_sl.c 8.6 (Berkeley) 2/1/94
- * $Id: if_sl.c,v 1.10 1994/11/26 19:24:00 bde Exp $
+ * $Id: if_sl.c,v 1.11 1994/11/27 15:29:57 bde Exp $
*/
/*
@@ -307,7 +307,8 @@ slclose(tp,flag)
register struct sl_softc *sc;
int s;
- ttywflush(tp);
+ if (ttywflush(tp))
+ ttyflush(tp, FREAD | FWRITE);
/*
* XXX the placement of the following spl is misleading. tty
* interrupts must be blocked across line discipline switches
OpenPOWER on IntegriCloud