From owner-svn-src-head@FreeBSD.ORG  Mon Jul  4 17:43:04 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 D28811065672;
	Mon,  4 Jul 2011 17:43:04 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C38D98FC16;
	Mon,  4 Jul 2011 17:43:04 +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 p64Hh4w3028302;
	Mon, 4 Jul 2011 17:43:04 GMT (envelope-from eri@svn.freebsd.org)
Received: (from eri@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p64Hh4HJ028300;
	Mon, 4 Jul 2011 17:43:04 GMT (envelope-from eri@svn.freebsd.org)
Message-Id: <201107041743.p64Hh4HJ028300@svn.freebsd.org>
From: Ermal Luçi <eri@FreeBSD.org>
Date: Mon, 4 Jul 2011 17:43:04 +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: r223765 - 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: Mon, 04 Jul 2011 17:43:04 -0000

Author: eri
Date: Mon Jul  4 17:43:04 2011
New Revision: 223765
URL: http://svn.freebsd.org/changeset/base/223765

Log:
  pf(4) tags now store the state key but tcp_respond tries to reuse a mbuf as an optimization.
  This makes pf find the wrong state and cause errors reported with state mismatches.
  Clear the cached state link on the pf(4) tag to avoid the state mismatches.
  
  Approved by:	bz

Modified:
  head/sys/netinet/tcp_subr.c

Modified: head/sys/netinet/tcp_subr.c
==============================================================================
--- head/sys/netinet/tcp_subr.c	Mon Jul  4 17:03:19 2011	(r223764)
+++ head/sys/netinet/tcp_subr.c	Mon Jul  4 17:43:04 2011	(r223765)
@@ -541,6 +541,7 @@ tcp_respond(struct tcpcb *tp, void *ipge
 		m_freem(m->m_next);
 		m->m_next = NULL;
 		m->m_data = (caddr_t)ipgen;
+		m_addr_changed(m);
 		/* m_len is set later */
 		tlen = 0;
 #define xchg(a,b,type) { type t; t=a; a=b; b=t; }