From owner-svn-src-user@FreeBSD.ORG  Thu Oct  8 22:53:45 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6AB531065695;
	Thu,  8 Oct 2009 22:53:45 +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 E34EB8FC15;
	Thu,  8 Oct 2009 22:53:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n98MriF7036246;
	Thu, 8 Oct 2009 22:53:44 GMT (envelope-from eri@svn.freebsd.org)
Received: (from eri@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n98Mri9W036244;
	Thu, 8 Oct 2009 22:53:44 GMT (envelope-from eri@svn.freebsd.org)
Message-Id: <200910082253.n98Mri9W036244@svn.freebsd.org>
From: Ermal Luçi <eri@FreeBSD.org>
Date: Thu, 8 Oct 2009 22:53:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197888 - user/eri/pf45/head/sys/contrib/pf/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Oct 2009 22:53:45 -0000

Author: eri
Date: Thu Oct  8 22:53:44 2009
New Revision: 197888
URL: http://svn.freebsd.org/changeset/base/197888

Log:
  Correct pf tag declaration.

Modified:
  user/eri/pf45/head/sys/contrib/pf/net/pf_mtag.h

Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_mtag.h
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pf_mtag.h	Thu Oct  8 22:45:18 2009	(r197887)
+++ user/eri/pf45/head/sys/contrib/pf/net/pf_mtag.h	Thu Oct  8 22:53:44 2009	(r197888)
@@ -37,15 +37,16 @@
 #define	PF_TAG_GENERATED		0x01
 #define	PF_TAG_FRAGCACHE		0x02
 #define	PF_TAG_TRANSLATE_LOCALHOST	0x04
+#define	PF_TAG_DIVERTED			0x08
 
 struct pf_mtag {
 	void		*hdr;		/* saved hdr pos in mbuf, for ECN */
-	u_int		 rtableid;	/* alternate routing table id */
+	void		*statekey;	/* pf stackside statekey */
 	u_int32_t	 qid;		/* queue id */
+	u_int		 rtableid;	/* alternate routing table id */
 	u_int16_t	 tag;		/* tag id */
 	u_int8_t	 flags;
 	u_int8_t	 routed;
-	sa_family_t	 af;		/* for ECN */
 };
 
 static __inline struct pf_mtag *pf_find_mtag(struct mbuf *);