From: dlg <dlg@openbsd.org>
Date: Fri, 15 Dec 2017 01:40:39 +0000 (+0000)
Subject: ifq_barrier should be callable by any nic, not just MPSAFE ones.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0ae2a132d0357ab06424ec0bba3711d959010ac1;p=openbsd

ifq_barrier should be callable by any nic, not just MPSAFE ones.

if (when) tx mitigation goes in again, all nics will have deferred
work that will need a barrier to ensure isn't running anymore.

found by bluhm@ when tx mit was in.
---

diff --git a/sys/net/ifq.c b/sys/net/ifq.c
index 2ab11a9c1e1..add143c1acb 100644
--- a/sys/net/ifq.c
+++ b/sys/net/ifq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifq.c,v 1.18 2017/12/15 01:37:30 dlg Exp $ */
+/*	$OpenBSD: ifq.c,v 1.19 2017/12/15 01:40:39 dlg Exp $ */
 
 /*
  * Copyright (c) 2015 David Gwynne <dlg@openbsd.org>
@@ -142,9 +142,6 @@ ifq_barrier(struct ifqueue *ifq)
 	struct cond c = COND_INITIALIZER();
 	struct task t = TASK_INITIALIZER(ifq_barrier_task, &c);
 
-	/* this should only be called from converted drivers */
-	KASSERT(ISSET(ifq->ifq_if->if_xflags, IFXF_MPSAFE));
-
 	if (ifq->ifq_serializer == NULL)
 		return;