2 files changed, 10 insertions, 1 deletions

diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c
index d2c0f8f1c5c4..aa3bb1843ba5 100644
--- a/sys/dev/netmap/netmap.c
+++ b/sys/dev/netmap/netmap.c
@@ -4236,7 +4236,7 @@ nm_set_native_flags(struct netmap_adapter *na)
 	struct ifnet *ifp = na->ifp;
 
 	/* We do the setup for intercepting packets only if we are the
-	 * first user of this adapapter. */
+	 * first user of this adapter. */
 	if (na->active_fds > 0) {
 		return;
 	}
diff --git a/sys/net/iflib.c b/sys/net/iflib.c
index cc401a5db24d..1b86fd670ac4 100644
--- a/sys/net/iflib.c
+++ b/sys/net/iflib.c
@@ -809,6 +809,13 @@ iflib_netmap_register(struct netmap_adapter *na, int onoff)
 	if (!CTX_IS_VF(ctx))
 		IFDI_CRCSTRIP_SET(ctx, onoff, iflib_crcstrip);
 
+	/*
+	 * Stop any pending txsync/rxsync and prevent new ones
+	 * form starting. Processes blocked in poll() will get
+	 * POLLERR.
+	 */
+	netmap_disable_all_rings(ifp);
+
 	iflib_stop(ctx);
 
 	/*
@@ -828,6 +835,8 @@ iflib_netmap_register(struct netmap_adapter *na, int onoff)
 	if (status)
 		nm_clear_native_flags(na);
 	CTX_UNLOCK(ctx);
+        /* Re-enable txsync/rxsync. */
+	netmap_enable_all_rings(ifp);
 	return (status);
 }