diff options
| author | luigi <luigi@FreeBSD.org> | 2014-08-20 23:34:36 +0000 |
|---|---|---|
| committer | luigi <luigi@FreeBSD.org> | 2014-08-20 23:34:36 +0000 |
| commit | 223d76dc5012ea77078296847800a3d6181c61e2 (patch) | |
| tree | d5d5263ca0c34de806d5e9e07b0b85eab96545f9 /sys/dev/e1000/if_igb.c | |
| parent | b63e85f63f1ee972ee2221c84e26cc35597b38f7 (diff) | |
| download | FreeBSD-src-223d76dc5012ea77078296847800a3d6181c61e2.zip FreeBSD-src-223d76dc5012ea77078296847800a3d6181c61e2.tar.gz | |
MFC 270063: update of netmap code
(vtnet and cxgbe not merged yet because we need some other mfc first)
Diffstat (limited to 'sys/dev/e1000/if_igb.c')
| -rw-r--r-- | sys/dev/e1000/if_igb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c index 15d71ce..484cba1 100644 --- a/sys/dev/e1000/if_igb.c +++ b/sys/dev/e1000/if_igb.c @@ -3531,7 +3531,7 @@ igb_setup_transmit_ring(struct tx_ring *txr) if (slot) { int si = netmap_idx_n2k(&na->tx_rings[txr->me], i); /* no need to set the address */ - netmap_load_map(txr->txtag, txbuf->map, NMB(slot + si)); + netmap_load_map(na, txr->txtag, txbuf->map, NMB(na, slot + si)); } #endif /* DEV_NETMAP */ /* clear the watch index */ @@ -4335,8 +4335,8 @@ igb_setup_receive_ring(struct rx_ring *rxr) uint64_t paddr; void *addr; - addr = PNMB(slot + sj, &paddr); - netmap_load_map(rxr->ptag, rxbuf->pmap, addr); + addr = PNMB(na, slot + sj, &paddr); + netmap_load_map(na, rxr->ptag, rxbuf->pmap, addr); /* Update descriptor */ rxr->rx_base[j].read.pkt_addr = htole64(paddr); continue; |
