socsvn commit: r307252 - in soc2016/vincenzo/head/sys: conf dev/netmap

[vincenzo at FreeBSD.org]

Author: vincenzo
Date: Fri Aug  5 16:46:07 2016
New Revision: 307252
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307252

Log:
  netmap: update files and fix if_ptnet KASSERT calls

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

Modified: soc2016/vincenzo/head/sys/conf/files
==============================================================================
--- soc2016/vincenzo/head/sys/conf/files	Fri Aug  5 16:11:11 2016	(r307251)
+++ soc2016/vincenzo/head/sys/conf/files	Fri Aug  5 16:46:07 2016	(r307252)
@@ -2117,6 +2117,7 @@
 dev/ncr/ncr.c			optional ncr pci
 dev/ncv/ncr53c500.c		optional ncv
 dev/ncv/ncr53c500_pccard.c	optional ncv pccard
+dev/netmap/if_ptnet.c		optional netmap
 dev/netmap/netmap.c		optional netmap
 dev/netmap/netmap_freebsd.c	optional netmap
 dev/netmap/netmap_generic.c	optional netmap
@@ -2126,6 +2127,7 @@
 dev/netmap/netmap_offloadings.c	optional netmap
 dev/netmap/netmap_pipe.c	optional netmap
 dev/netmap/netmap_vale.c	optional netmap
+dev/netmap/ptnetmap.c		optional netmap
 # compile-with "${NORMAL_C} -Wconversion -Wextra"
 dev/nfsmb/nfsmb.c		optional nfsmb pci
 dev/nge/if_nge.c		optional nge

Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c
==============================================================================
--- soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Fri Aug  5 16:11:11 2016	(r307251)
+++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Fri Aug  5 16:46:07 2016	(r307252)
@@ -883,7 +883,7 @@
 
 	nm_buf_size = NETMAP_BUF_SIZE(na_dr);
 
-	KASSERT(nm_buf_size > 0, "Invalid netmap buffer size");
+	KASSERT(nm_buf_size > 0, ("Invalid netmap buffer size"));
 	sc->min_tx_space = PTNET_MAX_PKT_SIZE / nm_buf_size + 2;
 	device_printf(sc->dev, "%s: min_tx_space = %u\n", __func__,
 		      sc->min_tx_space);
@@ -1811,8 +1811,8 @@
 				slot->flags = NS_MOREFRAG;
 
 				head = nm_next(head, lim);
-				KASSERT(head != rina->tail,
-					"Unexpectedly run out of TX space");
+				KASSERT(head != ring->tail,
+					("Unexpectedly run out of TX space"));
 				slot = ring->slot + head;
 				nmbuf = NMB(na, slot);
 				nmbuf_bytes = 0;
@@ -2213,7 +2213,7 @@
 	bool borrow = false;
 	int i;
 
-	KASSERT(sc->num_rings > 0, "Found no queues in while polling ptnet");
+	KASSERT(sc->num_rings > 0, ("Found no queues in while polling ptnet"));
 	queue_budget = MAX(budget / sc->num_rings, 1);
 	RD(1, "Per-queue budget is %d", queue_budget);