socsvn commit: r337273 - in soc2018/sduo/head/sys: dev/ixl net

[sduo at FreeBSD.org]

Author: sduo
Date: Wed Aug  1 20:28:22 2018
New Revision: 337273
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=337273

Log:
  Updated calls to netmap_load_map().

Modified:
  soc2018/sduo/head/sys/dev/ixl/ixl_txrx.c
  soc2018/sduo/head/sys/net/iflib.c

Modified: soc2018/sduo/head/sys/dev/ixl/ixl_txrx.c
==============================================================================
--- soc2018/sduo/head/sys/dev/ixl/ixl_txrx.c	Wed Aug  1 20:04:37 2018	(r337272)
+++ soc2018/sduo/head/sys/dev/ixl/ixl_txrx.c	Wed Aug  1 20:28:22 2018	(r337273)
@@ -618,7 +618,8 @@
 		if (slot) {
 			struct netmap_kring *kring = na->tx_rings[que->me];
 			int si = netmap_idx_n2k(kring, i);
-			netmap_load_map(na, buf->tag, buf->map, NMB(kring, slot + si));
+			netmap_load_map(na, buf->tag, buf->map, NMB(kring, slot + si),
+					NETMAP_BUF_SIZE(kring, 0));
 		}
 #endif /* DEV_NETMAP */
 		/* Clear the EOP index */
@@ -1424,7 +1425,8 @@
 			void *addr;
 
 			addr = PNMB(kring, slot + sj, &paddr);
-			netmap_load_map(na, rxr->dma.tag, buf->pmap, addr);
+			netmap_load_map(na, rxr->dma.tag, buf->pmap, addr,
+					NETMAP_BUF_SIZE(kring, 0));
 			/* Update descriptor and the cached value */
 			rxr->base[j].read.pkt_addr = htole64(paddr);
 			rxr->base[j].read.hdr_addr = 0;

Modified: soc2018/sduo/head/sys/net/iflib.c
==============================================================================
--- soc2018/sduo/head/sys/net/iflib.c	Wed Aug  1 20:04:37 2018	(r337272)
+++ soc2018/sduo/head/sys/net/iflib.c	Wed Aug  1 20:28:22 2018	(r337273)
@@ -858,7 +858,8 @@
 
 			fl->ifl_vm_addrs[tmp_pidx] = addr;
 			if (__predict_false(init) && map) {
-				netmap_load_map(na, fl->ifl_ifdi->idi_tag, map[nic_i], addr);
+				netmap_load_map(na, fl->ifl_ifdi->idi_tag, map[nic_i], addr,
+						NETMAP_BUF_SIZE(kring, 0));
 			} else if (map && (slot->flags & NS_BUF_CHANGED)) {
 				/* buffer has changed, reload map */
 				netmap_reload_map(na, fl->ifl_ifdi->idi_tag, map[nic_i], addr);
@@ -1203,7 +1204,7 @@
 		 */
 		struct netmap_kring *kring = na->tx_rings[txq->ift_id];
 		int si = netmap_idx_n2k(kring, i);
-		netmap_load_map(na, txq->ift_desc_tag, txq->ift_sds.ifsd_map[i], NMB(kring, slot + si));
+		netmap_load_map(na, txq->ift_desc_tag, txq->ift_sds.ifsd_map[i], NMB(kring, slot + si), NETMAP_BUF_SIZE(kring, 0));
 	}
 }