From owner-cvs-src@FreeBSD.ORG Sat Jun 26 08:44:26 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 238EC16A4CE; Sat, 26 Jun 2004 08:44:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21FE543D46; Sat, 26 Jun 2004 08:44:26 +0000 (GMT) (envelope-from phk@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5Q8i479054885; Sat, 26 Jun 2004 08:44:04 GMT (envelope-from phk@repoman.freebsd.org) Received: (from phk@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5Q8i4Yb054884; Sat, 26 Jun 2004 08:44:04 GMT (envelope-from phk) Message-Id: <200406260844.i5Q8i4Yb054884@repoman.freebsd.org> From: Poul-Henning Kamp Date: Sat, 26 Jun 2004 08:44:04 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/kern tty.c src/sys/net if_sl.c ppp_tty.c src/sys/netgraph ng_tty.c src/sys/netgraph/bluetooth/drivers/h4 ng_h4.c src/sys/sys linedisc.h tty.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jun 2004 08:44:26 -0000 phk 2004-06-26 08:44:04 UTC FreeBSD src repository Modified files: sys/kern tty.c sys/net if_sl.c ppp_tty.c sys/netgraph ng_tty.c sys/netgraph/bluetooth/drivers/h4 ng_h4.c sys/sys linedisc.h tty.h Log: Fix line discipline switching issues: If opening a new ldisc fails, we have to revert to TTYDISC which we know will successfully open rather than try the previous ldisc which might also fail to open. Do not let ldisc implementations muck about with ->t_line, and remove code which checks for reopens, it should never happen. Move ldisc->l_hotchar to tty->t_hotchar and have ldisc implementation initialize it in their open routines. Reset to zero when we enter TTYDISC. ("no" should really be -1 since zero could be a valid hotchar for certain old european mainframe protocols.) Revision Changes Path 1.224 +21 -12 src/sys/kern/tty.c 1.119 +2 -7 src/sys/net/if_sl.c 1.59 +2 -10 src/sys/net/ppp_tty.c 1.10 +1 -10 src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c 1.28 +2 -9 src/sys/netgraph/ng_tty.c 1.192 +0 -1 src/sys/sys/linedisc.h 1.84 +1 -0 src/sys/sys/tty.h