From owner-svn-src-head@FreeBSD.ORG  Sat May 14 14:41:41 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6078D106566B;
	Sat, 14 May 2011 14:41:41 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 512438FC0C;
	Sat, 14 May 2011 14:41:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4EEff57006331;
	Sat, 14 May 2011 14:41:41 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4EEffX1006328;
	Sat, 14 May 2011 14:41:41 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201105141441.p4EEffX1006328@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Sat, 14 May 2011 14:41:41 +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: r221891 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 May 2011 14:41:41 -0000

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;
 
 	/*