From owner-svn-src-all@FreeBSD.ORG Tue Dec 9 15:49:03 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01CF1106564A; Tue, 9 Dec 2008 15:49:03 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E526C8FC1F; Tue, 9 Dec 2008 15:49:02 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9Fn27g094679; Tue, 9 Dec 2008 15:49:02 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB9Fn2Pb094678; Tue, 9 Dec 2008 15:49:02 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200812091549.mB9Fn2Pb094678@svn.freebsd.org> From: Robert Watson Date: Tue, 9 Dec 2008 15:49:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185795 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 15:49:03 -0000 Author: rwatson Date: Tue Dec 9 15:49:02 2008 New Revision: 185795 URL: http://svn.freebsd.org/changeset/base/185795 Log: Enhance one comment relating to recent TCP locking changes, and fix a typo in another. MFC after: 6 weeks Modified: head/sys/netinet/tcp_input.c Modified: head/sys/netinet/tcp_input.c ============================================================================== --- head/sys/netinet/tcp_input.c Tue Dec 9 14:56:39 2008 (r185794) +++ head/sys/netinet/tcp_input.c Tue Dec 9 15:49:02 2008 (r185795) @@ -480,11 +480,11 @@ tcp_input(struct mbuf *m, int off0) /* * Locate pcb for segment, which requires a lock on tcbinfo. - * Optimisticaly acquire a global read lock unless header flags - * necessarily imply a state change. There are two cases where we - * might discover later we need a write lock despite the flags: ACKs - * moving a connection out of the syncache, and ACK relating to a - * connection in TIMEWAIT. + * Optimisticaly acquire a global read lock rather than a write lock + * unless header flags necessarily imply a state change. There are + * two cases where we might discover later we need a write lock + * despite the flags: ACKs moving a connection out of the syncache, + * and ACKs for a connection in TIMEWAIT. */ if ((thflags & (TH_SYN | TH_FIN | TH_RST)) != 0 || tcp_read_locking == 0) { @@ -1087,7 +1087,7 @@ tcp_do_segment(struct mbuf *m, struct tc * allow either a read lock or a write lock, as we may have acquired * a write lock due to a race. * - * Require a global write lock for SYN/SIN/RST segments or + * Require a global write lock for SYN/FIN/RST segments or * non-established connections; otherwise accept either a read or * write lock, as we may have conservatively acquired a write lock in * certain cases in tcp_input() (is this still true?). Currently we