Author: np Date: Tue Feb 20 21:42:45 2018 New Revision: 329675 URL: https://svnweb.freebsd.org/changeset/base/329675
Log: Catch up with the removal of nktr_slot_flags from upstream netmap. No functional impact intended. Submitted by: Vincenzo Maffione <[email protected]> Modified: head/sys/dev/cxgbe/t4_netmap.c head/sys/net/iflib.c Modified: head/sys/dev/cxgbe/t4_netmap.c ============================================================================== --- head/sys/dev/cxgbe/t4_netmap.c Tue Feb 20 21:37:55 2018 (r329674) +++ head/sys/dev/cxgbe/t4_netmap.c Tue Feb 20 21:42:45 2018 (r329675) @@ -974,7 +974,7 @@ t4_nm_intr(void *arg) case CPL_RX_PKT: ring->slot[fl_cidx].len = G_RSPD_LEN(lq) - sc->params.sge.fl_pktshift; - ring->slot[fl_cidx].flags = kring->nkr_slot_flags; + ring->slot[fl_cidx].flags = 0; fl_cidx += (lq & F_RSPD_NEWBUF) ? 1 : 0; fl_credits += (lq & F_RSPD_NEWBUF) ? 1 : 0; if (__predict_false(fl_cidx == nm_rxq->fl_sidx)) Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Tue Feb 20 21:37:55 2018 (r329674) +++ head/sys/net/iflib.c Tue Feb 20 21:42:45 2018 (r329675) @@ -1068,7 +1068,6 @@ iflib_netmap_rxsync(struct netmap_kring *kring, int fl if (netmap_no_pendintr || force_update) { int crclen = iflib_crcstrip ? 0 : 4; int error, avail; - uint16_t slot_flags = kring->nkr_slot_flags; for (i = 0; i < rxq->ifr_nfl; i++) { fl = &rxq->ifr_fl[i]; @@ -1084,7 +1083,7 @@ iflib_netmap_rxsync(struct netmap_kring *kring, int fl error = ctx->isc_rxd_pkt_get(ctx->ifc_softc, &ri); ring->slot[nm_i].len = error ? 0 : ri.iri_len - crclen; - ring->slot[nm_i].flags = slot_flags; + ring->slot[nm_i].flags = 0; if (fl->ifl_sds.ifsd_map) bus_dmamap_sync(fl->ifl_ifdi->idi_tag, fl->ifl_sds.ifsd_map[nic_i], BUS_DMASYNC_POSTREAD); _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "[email protected]"
