Date: Sat, 25 Dec 2004 22:46:37 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/netinet tcp_input.c Message-ID: <200412252246.iBPMkbbw071465@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
rwatson 2004-12-25 22:46:37 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_5)
sys/netinet tcp_input.c
Log:
Merge tcp_input.c:1.258 from HEAD to RELENG_5, with the exception of
one block obsoleted by the decision not to hold the TCP pcbinfo lock
over a jump to check_delack:
date: 2004/11/23 23:41:20; author: rwatson; state: Exp; lines: +19 -12
In tcp_reass(), assert the inpcb lock on the passed tcpcb, since the
contents of the tcpcb are read and modified in volume.
In tcp_input(), replace th comparison with 0 with a comparison with
NULL.
At the 'findpcb', 'dropafterack', and 'dropwithreset' labels in
tcp_input(), assert 'headlocked'. Try to improve consistency between
various assertions regarding headlocked to be more informative.
MFC after: 2 weeks
Revision Changes Path
1.252.2.7 +18 -11 src/sys/netinet/tcp_input.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412252246.iBPMkbbw071465>