Received: by mail.netbsd.org (Postfix, from userid 605) id D765114A163; Fri, 24 Jul 2015 07:37:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D1CD814A151 for ; Fri, 24 Jul 2015 07:37:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id JdsPGkIYmjn9 for ; Fri, 24 Jul 2015 07:37:49 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 456E614A119 for ; Fri, 24 Jul 2015 07:37:49 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 4303B98; Fri, 24 Jul 2015 07:37:49 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Fri, 24 Jul 2015 07:37:49 +0000 From: "Martin Husemann" Subject: CVS commit: [netbsd-6-0] src/sys/netinet To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20150724073749.4303B98@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Martin Husemann" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: martin Date: Fri Jul 24 07:37:49 UTC 2015 Modified Files: src/sys/netinet [netbsd-6-0]: tcp_input.c tcp_output.c Log Message: Pull up following revision(s) (requested by matt in ticket #1315): sys/netinet/tcp_output.c: revision 1.184 sys/netinet/tcp_input.c: revision 1.343 If we are sending a window probe and there's unacked data in the socket, make sure at least the persist timer is running. Make sure that snd_win doesn't go negative. To generate a diff of this commit: cvs rdiff -u -r1.321 -r1.321.6.1 src/sys/netinet/tcp_input.c cvs rdiff -u -r1.173.6.1 -r1.173.6.2 src/sys/netinet/tcp_output.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.