Date: Mon, 7 May 2018 22:33:41 +0000 (UTC) From: Stephen Hurd <shurd@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r333340 - stable/11/sys/net Message-ID: <201805072233.w47MXfmv067937@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: shurd Date: Mon May 7 22:33:40 2018 New Revision: 333340 URL: https://svnweb.freebsd.org/changeset/base/333340 Log: Direct commit to stable/11 to fix botched r333338 netmap nm_intr is not part of stable/11 Approved by: re (marius@) Sponsored by: Limelight Networks Modified: stable/11/sys/net/iflib.c Modified: stable/11/sys/net/iflib.c ============================================================================== --- stable/11/sys/net/iflib.c Mon May 7 22:29:32 2018 (r333339) +++ stable/11/sys/net/iflib.c Mon May 7 22:33:40 2018 (r333340) @@ -1114,22 +1114,6 @@ iflib_netmap_rxsync(struct netmap_kring *kring, int fl return (netmap_fl_refill(rxq, kring, nm_i, false)); } -static void -iflib_netmap_intr(struct netmap_adapter *na, int onoff) -{ - struct ifnet *ifp = na->ifp; - if_ctx_t ctx = ifp->if_softc; - - CTX_LOCK(ctx); - if (onoff) { - IFDI_INTR_ENABLE(ctx); - } else { - IFDI_INTR_DISABLE(ctx); - } - CTX_UNLOCK(ctx); -} - - static int iflib_netmap_attach(if_ctx_t ctx) { @@ -1148,7 +1132,6 @@ iflib_netmap_attach(if_ctx_t ctx) na.nm_txsync = iflib_netmap_txsync; na.nm_rxsync = iflib_netmap_rxsync; na.nm_register = iflib_netmap_register; - na.nm_intr = iflib_netmap_intr; na.num_tx_rings = ctx->ifc_softc_ctx.isc_ntxqsets; na.num_rx_rings = ctx->ifc_softc_ctx.isc_nrxqsets; return (netmap_attach(&na));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805072233.w47MXfmv067937>