Date: Sat, 14 May 2011 14:41:41 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r221891 - head/sys/netinet Message-ID: <201105141441.p4EEffX1006328@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Sat May 14 14:41:40 2011 New Revision: 221891 URL: http://svn.freebsd.org/changeset/base/221891 Log: Oops, fix order of sequence numbers in KASSERT()'s to catch negative receive windows to match the labels in the panic message. Submitted by: trociny Modified: head/sys/netinet/tcp_input.c head/sys/netinet/tcp_timewait.c Modified: head/sys/netinet/tcp_input.c ============================================================================== --- head/sys/netinet/tcp_input.c Sat May 14 14:40:24 2011 (r221890) +++ head/sys/netinet/tcp_input.c Sat May 14 14:41:40 2011 (r221891) @@ -1833,7 +1833,7 @@ tcp_do_segment(struct mbuf *m, struct tc win = 0; KASSERT(SEQ_GEQ(tp->rcv_adv, tp->rcv_nxt), ("tcp_input negative window: tp %p rcv_nxt %u rcv_adv %u", tp, - tp->rcv_adv, tp->rcv_nxt)); + tp->rcv_nxt, tp->rcv_adv)); tp->rcv_wnd = imax(win, (int)(tp->rcv_adv - tp->rcv_nxt)); /* Reset receive buffer auto scaling when not in bulk receive mode. */ Modified: head/sys/netinet/tcp_timewait.c ============================================================================== --- head/sys/netinet/tcp_timewait.c Sat May 14 14:40:24 2011 (r221890) +++ head/sys/netinet/tcp_timewait.c Sat May 14 14:41:40 2011 (r221891) @@ -244,7 +244,7 @@ tcp_twstart(struct tcpcb *tp) */ KASSERT(SEQ_GEQ(tp->rcv_adv, tp->rcv_nxt), ("tcp_twstart negative window: tp %p rcv_nxt %u rcv_adv %u", tp, - tp->rcv_adv, tp->rcv_nxt)); + tp->rcv_nxt, tp->rcv_adv)); tw->last_win = (tp->rcv_adv - tp->rcv_nxt) >> tp->rcv_scale; /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105141441.p4EEffX1006328>