27c27
< * $FreeBSD: head/sys/dev/netmap/if_re_netmap.h 260368 2014-01-06 12:53:15Z luigi $
---
> * $FreeBSD: head/sys/dev/netmap/if_re_netmap.h 270063 2014-08-16 15:00:01Z luigi $
68c68
< re_netmap_txsync(struct netmap_adapter *na, u_int ring_nr, int flags)
---
> re_netmap_txsync(struct netmap_kring *kring, int flags)
69a70
> struct netmap_adapter *na = kring->na;
71d71
< struct netmap_kring *kring = &na->tx_rings[ring_nr];
99c99
< void *addr = PNMB(slot, &paddr);
---
> void *addr = PNMB(na, slot, &paddr);
106c106
< NM_CHECK_ADDR_LEN(addr, len);
---
> NM_CHECK_ADDR_LEN(na, addr, len);
115c115
< netmap_reload_map(sc->rl_ldata.rl_tx_mtag,
---
> netmap_reload_map(na, sc->rl_ldata.rl_tx_mtag,
172c172
< re_netmap_rxsync(struct netmap_adapter *na, u_int ring_nr, int flags)
---
> re_netmap_rxsync(struct netmap_kring *kring, int flags)
173a174
> struct netmap_adapter *na = kring->na;
175d175
< struct netmap_kring *kring = &na->rx_rings[ring_nr];
243c243
< void *addr = PNMB(slot, &paddr);
---
> void *addr = PNMB(na, slot, &paddr);
246c246
< int cmd = NETMAP_BUF_SIZE | RL_RDESC_CMD_OWN;
---
> int cmd = NETMAP_BUF_SIZE(na) | RL_RDESC_CMD_OWN;
248c248
< if (addr == netmap_buffer_base) /* bad buf */
---
> if (addr == NETMAP_BUF_BASE(na)) /* bad buf */
258c258
< netmap_reload_map(sc->rl_ldata.rl_rx_mtag,
---
> netmap_reload_map(na, sc->rl_ldata.rl_rx_mtag,
299,302d298
< if (!na || !(na->na_flags & NAF_NATIVE_ON)) {
< return;
< }
<
304c300
< /* slot is NULL if we are not in netmap mode */
---
> /* slot is NULL if we are not in native netmap mode */
306c302
< return; // XXX cannot happen
---
> return;
316c312
< void *addr = PNMB(slot + l, &paddr);
---
> void *addr = PNMB(na, slot + l, &paddr);
320c316
< netmap_load_map(sc->rl_ldata.rl_tx_mtag,
---
> netmap_load_map(na, sc->rl_ldata.rl_tx_mtag,
347c343
< addr = PNMB(slot + nm_i, &paddr);
---
> addr = PNMB(na, slot + nm_i, &paddr);
349c345
< netmap_reload_map(sc->rl_ldata.rl_rx_mtag,
---
> netmap_reload_map(na, sc->rl_ldata.rl_rx_mtag,
355c351
< cmdstat = NETMAP_BUF_SIZE;
---
> cmdstat = NETMAP_BUF_SIZE(na);