From owner-svn-src-all@FreeBSD.ORG  Thu Sep  4 19:28:03 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 68ED574F;
 Thu,  4 Sep 2014 19:28:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5456D1AC9;
 Thu,  4 Sep 2014 19:28:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s84JS3UD003973;
 Thu, 4 Sep 2014 19:28:03 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s84JS3Oo003972;
 Thu, 4 Sep 2014 19:28:03 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201409041928.s84JS3Oo003972@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 4 Sep 2014 19:28:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r271123 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Sep 2014 19:28:03 -0000

Author: glebius
Date: Thu Sep  4 19:28:02 2014
New Revision: 271123
URL: http://svnweb.freebsd.org/changeset/base/271123

Log:
  Satisfy assertion in m_demote().
  
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/netinet/tcp_reass.c

Modified: head/sys/netinet/tcp_reass.c
==============================================================================
--- head/sys/netinet/tcp_reass.c	Thu Sep  4 19:27:30 2014	(r271122)
+++ head/sys/netinet/tcp_reass.c	Thu Sep  4 19:28:02 2014	(r271123)
@@ -231,6 +231,7 @@ tcp_reass(struct tcpcb *tp, struct tcphd
 		tp->t_segq = m;
 		if (mq && th->th_seq + *tlenp == M_TCPHDR(mq)->th_seq) {
 			m->m_nextpkt = mq->m_nextpkt;
+			mq->m_nextpkt = NULL;
 			m_catpkt(m, mq);
 		} else
 			m->m_nextpkt = mq;