From owner-svn-soc-all@freebsd.org  Mon Jul  4 07:42:07 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 90EC9B91A3F
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon,  4 Jul 2016 07:42:07 +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 8489F24A4
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Jul 2016 07:42:07 +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 u647g7BI047920
 for <svn-soc-all@FreeBSD.org>; Mon, 4 Jul 2016 07:42:07 GMT
 (envelope-from vincenzo@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u647g6vA047898
 for svn-soc-all@FreeBSD.org; Mon, 4 Jul 2016 07:42:06 GMT
 (envelope-from vincenzo@FreeBSD.org)
Date: Mon, 4 Jul 2016 07:42:06 GMT
Message-Id: <201607040742.u647g6vA047898@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: r305704 - 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: Mon, 04 Jul 2016 07:42:07 -0000

Author: vincenzo
Date: Mon Jul  4 07:42:06 2016
New Revision: 305704
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305704

Log:
   freebsd: ptnet_transmit: update state variables at each iteration

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	Mon Jul  4 03:19:06 2016	(r305703)
+++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Mon Jul  4 07:42:06 2016	(r305704)
@@ -1218,12 +1218,7 @@
 	kring = na->tx_rings + pq->kring_id;
 	ring = kring->ring;
 	lim = kring->nkr_num_slots - 1;
-
-	/* Initialize transmission state variables. */
 	head = ring->head;
-	slot = ring->slot + head;
-	nmbuf = NMB(na, slot);
-	nmbuf_bytes = 0;
 
 	for (;;) {
 		if (head == ring->tail) {
@@ -1244,6 +1239,11 @@
 			break;
 		}
 
+		/* Initialize transmission state variables. */
+		slot = ring->slot + head;
+		nmbuf = NMB(na, slot);
+		nmbuf_bytes = 0;
+
 		for (prev_head = head, mf = m; mf; mf = mf->m_next) {
 			uint8_t *mdata = mf->m_data;
 			int mlen = mf->m_len;