From owner-svn-src-projects@FreeBSD.ORG  Tue Apr 17 14:37:30 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 800C1106564A;
	Tue, 17 Apr 2012 14:37:30 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BE458FC0A;
	Tue, 17 Apr 2012 14:37:30 +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 q3HEbUc1086354;
	Tue, 17 Apr 2012 14:37:30 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3HEbUH8086352;
	Tue, 17 Apr 2012 14:37:30 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201204171437.q3HEbUH8086352@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 17 Apr 2012 14:37:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234384 - projects/pf/head/sys/sys
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2012 14:37:30 -0000

Author: glebius
Date: Tue Apr 17 14:37:29 2012
New Revision: 234384
URL: http://svn.freebsd.org/changeset/base/234384

Log:
  Add MTAG_PERSISTENT to pf(4) tags. In OpenBSD they
  store the pf(4) information right in the mbuf header,
  and a persistent tag gives us similar behavior.
  
  This flag is crucial for infinite recursion protection
  in the pf_route() and pf_route6().
  
  Discussed with:		eri

Modified:
  projects/pf/head/sys/sys/mbuf.h

Modified: projects/pf/head/sys/sys/mbuf.h
==============================================================================
--- projects/pf/head/sys/sys/mbuf.h	Tue Apr 17 14:31:02 2012	(r234383)
+++ projects/pf/head/sys/sys/mbuf.h	Tue Apr 17 14:37:29 2012	(r234384)
@@ -989,7 +989,7 @@ struct mbuf	*m_unshare(struct mbuf *, in
 #define	PACKET_TAG_DIVERT			17 /* divert info */
 #define	PACKET_TAG_IPFORWARD			18 /* ipforward info */
 #define	PACKET_TAG_MACLABEL	(19 | MTAG_PERSISTENT) /* MAC label */
-#define	PACKET_TAG_PF				21 /* PF + ALTQ information */
+#define	PACKET_TAG_PF		(21 | MTAG_PERSISTENT) /* PF/ALTQ information */
 #define	PACKET_TAG_RTSOCKFAM			25 /* rtsock sa family */
 #define	PACKET_TAG_IPOPTIONS			27 /* Saved IP options */
 #define	PACKET_TAG_CARP				28 /* CARP info */