From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  7 08:38:41 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7E29C106564A;
	Thu,  7 Jun 2012 08:38:41 +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 694E98FC15;
	Thu,  7 Jun 2012 08:38: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 q578cfFt071002;
	Thu, 7 Jun 2012 08:38:41 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q578cfOG070999;
	Thu, 7 Jun 2012 08:38:41 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201206070838.q578cfOG070999@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 7 Jun 2012 08:38:41 +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: r236706 - projects/pf/head/sys/contrib/pf/net
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: Thu, 07 Jun 2012 08:38:41 -0000

Author: glebius
Date: Thu Jun  7 08:38:40 2012
New Revision: 236706
URL: http://svn.freebsd.org/changeset/base/236706

Log:
  rtableid is set in the mbuf hdr in FreeBSD, not in pf_mtag.

Modified:
  projects/pf/head/sys/contrib/pf/net/pf.c
  projects/pf/head/sys/contrib/pf/net/pf_mtag.h

Modified: projects/pf/head/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf.c	Thu Jun  7 08:32:53 2012	(r236705)
+++ projects/pf/head/sys/contrib/pf/net/pf.c	Thu Jun  7 08:38:40 2012	(r236706)
@@ -2088,10 +2088,7 @@ pf_send_tcp(struct mbuf *replyto, const 
 	pf_mtag->tag = rtag;
 
 	if (r != NULL && r->rtableid >= 0)
-	{
 		M_SETFIB(m, r->rtableid);
-		pf_mtag->rtableid = r->rtableid;
-	}
 
 #ifdef ALTQ
 	if (r != NULL && r->qid) {
@@ -2212,10 +2209,7 @@ pf_send_icmp(struct mbuf *m, u_int8_t ty
 	m0->m_flags |= M_SKIP_FIREWALL;
 
 	if (r->rtableid >= 0)
-	{
 		M_SETFIB(m0, r->rtableid);
-		pf_mtag->rtableid = r->rtableid;
-	}
 
 #ifdef ALTQ
 	if (r->qid) {

Modified: projects/pf/head/sys/contrib/pf/net/pf_mtag.h
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf_mtag.h	Thu Jun  7 08:32:53 2012	(r236705)
+++ projects/pf/head/sys/contrib/pf/net/pf_mtag.h	Thu Jun  7 08:38:40 2012	(r236706)
@@ -43,7 +43,6 @@
 struct pf_mtag {
 	void		*hdr;		/* saved hdr pos in mbuf, for ECN */
 	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;