From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757055AbbAPUHE (ORCPT ); Fri, 16 Jan 2015 15:07:04 -0500 Received: from mail-qc0-f182.google.com ([209.85.216.182]:43919 "EHLO mail-qc0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755295AbbAPUFy (ORCPT ); Fri, 16 Jan 2015 15:05:54 -0500 From: Peter Hurley To: Greg Kroah-Hartman Cc: Jiri Slaby , Christian Riesch , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Denis Du , =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= , Peter Hurley Subject: [PATCH v3 3/6] n_tty: Simplify throttle threshold calculation Date: Fri, 16 Jan 2015 15:05:36 -0500 Message-Id: <1421438739-29672-4-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1421438739-29672-1-git-send-email-peter@hurleysoftware.com> References: <1421113668-20468-1-git-send-email-peter@hurleysoftware.com> <1421438739-29672-1-git-send-email-peter@hurleysoftware.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The adjustments performed by receive_room() are to ensure a line termination can always be written to the read buffer. However, these adjustments are irrelevant to the throttle threshold (because the threshold < buffer limit). Signed-off-by: Peter Hurley --- drivers/tty/n_tty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index d4b14c3..7efabc4 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c @@ -262,7 +262,7 @@ static void n_tty_check_throttle(struct tty_struct *tty) while (1) { int throttled; tty_set_flow_change(tty, TTY_THROTTLE_SAFE); - if (receive_room(tty) >= TTY_THRESHOLD_THROTTLE) + if (N_TTY_BUF_SIZE - read_cnt(ldata) >= TTY_THRESHOLD_THROTTLE) break; throttled = tty_throttle_safe(tty); if (!throttled) -- 2.2.2