From: mpi <mpi@openbsd.org>
Date: Tue, 16 Jun 2015 11:17:02 +0000 (+0000)
Subject: Sync with recent changes.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c4cd757677b3c8a01e4763b7d025383544a9b407;p=openbsd

Sync with recent changes.
---

diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index dc90145d7b3..e47391846c8 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: mbuf.9,v 1.85 2015/02/19 05:53:46 dlg Exp $
+.\"     $OpenBSD: mbuf.9,v 1.86 2015/06/16 11:17:02 mpi Exp $
 .\"
 .\" Copyright (c) 2001 Jean-Jacques Bernard-Gundol <jjbg@openbsd.org>
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 19 2015 $
+.Dd $Mdocdate: June 16 2015 $
 .Dt MBUF 9
 .Os
 .Sh NAME
@@ -186,16 +186,16 @@ struct m_hdr {
 };
 
 struct pkthdr {
-	struct  ifnet *rcvif;
+	void			*ph_cookie;
 	SLIST_HEAD(packet_tags, m_tag) tags;
-	int     len;
-	u_int16_t tagsset;
-	u_int16_t pad;
-	u_int16_t csum_flags;
-	u_int16_t ether_vtag;
-	u_int	 ph_rtableid;
-	void	*ph_cookie;
-	struct	pkthdr_pf pf;
+	int			 len;
+	u_int16_t		 tagsset;
+	u_int16_t		 pad;
+	u_int16_t		 csum_flags;
+	u_int16_t		 ether_vtag;
+	u_int			 ph_rtableid;
+	u_int			 ph_ifidx;
+	struct pkthdr_pf	 pf;
 };
 
 struct pkthdr_pf {