diff options
author | Vincenzo Maffione <vmaffione@FreeBSD.org> | 2018-04-09 09:24:26 +0000 |
---|---|---|
committer | Vincenzo Maffione <vmaffione@FreeBSD.org> | 2018-04-09 09:24:26 +0000 |
commit | 4f80b14ce2b17100b12dc3a346fb9e6e76764e11 (patch) | |
tree | e7c1347079629914a4d8c369d8d70121ee53904f /sys/dev/netmap/if_igb_netmap.h | |
parent | df4531ffd910985c8ec5a288a69adff34ceb6c03 (diff) | |
download | src-4f80b14ce2b17100b12dc3a346fb9e6e76764e11.tar.gz src-4f80b14ce2b17100b12dc3a346fb9e6e76764e11.zip |
netmap: align codebase to upstream version v11.4
Changelist:
- remove unused nkr_slot_flags
- new nm_intr adapter callback to enable/disable interrupts
- remove unused sysctls and document the other sysctls
- new infrastructure to support NS_MOREFRAG for NIC ports
- support for external memory allocator (for now linux-only),
including linux-specific changes in common headers
- optimizations within netmap pipes datapath
- improvements on VALE control API
- new nm_parse() helper function in netmap_user.h
- various bug fixes and code clean up
Approved by: hrs (mentor)
Notes
Notes:
svn path=/head/; revision=332319
Diffstat (limited to 'sys/dev/netmap/if_igb_netmap.h')
-rw-r--r-- | sys/dev/netmap/if_igb_netmap.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/netmap/if_igb_netmap.h b/sys/dev/netmap/if_igb_netmap.h index cd80f2663bc7..df15ceee7d8c 100644 --- a/sys/dev/netmap/if_igb_netmap.h +++ b/sys/dev/netmap/if_igb_netmap.h @@ -217,8 +217,6 @@ igb_netmap_rxsync(struct netmap_kring *kring, int flags) * First part: import newly received packets. */ if (netmap_no_pendintr || force_update) { - uint16_t slot_flags = kring->nkr_slot_flags; - nic_i = rxr->next_to_check; nm_i = netmap_idx_n2k(kring, nic_i); @@ -229,7 +227,7 @@ igb_netmap_rxsync(struct netmap_kring *kring, int flags) if ((staterr & E1000_RXD_STAT_DD) == 0) break; ring->slot[nm_i].len = le16toh(curr->wb.upper.length); - ring->slot[nm_i].flags = slot_flags; + ring->slot[nm_i].flags = 0; bus_dmamap_sync(rxr->ptag, rxr->rx_buffers[nic_i].pmap, BUS_DMASYNC_POSTREAD); nm_i = nm_next(nm_i, lim); |