svn commit: r236706 - projects/pf/head/sys/contrib/pf/net

[Gleb Smirnoff]

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;