Date: Fri, 13 Apr 2018 17:45:54 +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: r332481 - stable/11/sys/dev/ixgbe Message-ID: <201804131745.w3DHjsTR069349@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: shurd Date: Fri Apr 13 17:45:54 2018 New Revision: 332481 URL: https://svnweb.freebsd.org/changeset/base/332481 Log: Move 1-second spin into ixgbe_netmap_reg() This should still work around the netmap issue, but should not impact other calls to ixgbe_stop(). PR: 221317 Sponsored by: Limelight Networks Modified: stable/11/sys/dev/ixgbe/if_ix.c stable/11/sys/dev/ixgbe/ixgbe_netmap.c Modified: stable/11/sys/dev/ixgbe/if_ix.c ============================================================================== --- stable/11/sys/dev/ixgbe/if_ix.c Fri Apr 13 17:37:39 2018 (r332480) +++ stable/11/sys/dev/ixgbe/if_ix.c Fri Apr 13 17:45:54 2018 (r332481) @@ -3567,8 +3567,6 @@ ixgbe_stop(void *arg) mtx_assert(&adapter->core_mtx, MA_OWNED); - msec_delay(1000); - INIT_DEBUGOUT("ixgbe_stop: begin\n"); ixgbe_disable_intr(adapter); callout_stop(&adapter->timer); Modified: stable/11/sys/dev/ixgbe/ixgbe_netmap.c ============================================================================== --- stable/11/sys/dev/ixgbe/ixgbe_netmap.c Fri Apr 13 17:37:39 2018 (r332480) +++ stable/11/sys/dev/ixgbe/ixgbe_netmap.c Fri Apr 13 17:45:54 2018 (r332481) @@ -151,6 +151,7 @@ ixgbe_netmap_reg(struct netmap_adapter *na, int onoff) struct adapter *adapter = ifp->if_softc; IXGBE_CORE_LOCK(adapter); + msec_delay(1000); adapter->stop_locked(adapter); set_crcstrip(&adapter->hw, onoff);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804131745.w3DHjsTR069349>