From owner-svn-soc-all@freebsd.org  Fri Jul  8 15:44:20 2016
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 23251B82579
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Fri,  8 Jul 2016 15:44:20 +0000 (UTC)
 (envelope-from vincenzo@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 162B5120C
 for <svn-soc-all@FreeBSD.org>; Fri,  8 Jul 2016 15:44:20 +0000 (UTC)
 (envelope-from vincenzo@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u68FiJSK008208
 for <svn-soc-all@FreeBSD.org>; Fri, 8 Jul 2016 15:44:19 GMT
 (envelope-from vincenzo@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u68FiJcW008128
 for svn-soc-all@FreeBSD.org; Fri, 8 Jul 2016 15:44:19 GMT
 (envelope-from vincenzo@FreeBSD.org)
Date: Fri, 8 Jul 2016 15:44:19 GMT
Message-Id: <201607081544.u68FiJcW008128@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 vincenzo@FreeBSD.org using -f
From: vincenzo@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r305828 - soc2016/vincenzo/head/sys/dev/netmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jul 2016 15:44:20 -0000

Author: vincenzo
Date: Fri Jul  8 15:44:18 2016
New Revision: 305828
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305828

Log:
   freebsd: ptnet_rx_eof: move mhead initialization close to if_input

Modified:
  soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c

Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c
==============================================================================
--- soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Fri Jul  8 15:44:03 2016	(r305827)
+++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Fri Jul  8 15:44:18 2016	(r305828)
@@ -1625,17 +1625,8 @@
 			break;
 		}
 
-		mhead->m_pkthdr.rcvif = ifp;
-		mhead->m_pkthdr.len = 0;
-
-                /* No support for checksum offloading for now. */
-		mhead->m_pkthdr.csum_flags = 0;
-
-		/* Store the queue idx in the packet header. */
-		mhead->m_pkthdr.flowid = pq->kring_id;
-		M_HASHTYPE_SET(mhead, M_HASHTYPE_OPAQUE);
-
 		/* Initialize state variables. */
+		mhead->m_pkthdr.len = 0;
 		mtail->m_len = 0;
 
 		/* Scan all the netmap slots containing the current packet. */
@@ -1680,6 +1671,15 @@
 			}
 		}
 
+		mhead->m_pkthdr.rcvif = ifp;
+
+                /* No support for checksum offloading for now. */
+		mhead->m_pkthdr.csum_flags = 0;
+
+		/* Store the queue idx in the packet header. */
+		mhead->m_pkthdr.flowid = pq->kring_id;
+		M_HASHTYPE_SET(mhead, M_HASHTYPE_OPAQUE);
+
 		PTNET_Q_UNLOCK(pq);
 		(*ifp->if_input)(ifp, mhead);
 		PTNET_Q_LOCK(pq);