diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2017-12-15 01:40:40 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2017-12-15 01:40:40 +0000 |
| commit | 0d15d4e2c2a6c1983e2d99d53adbb502b6f8afce (patch) | |
| tree | 8c0723bb39ae04e00dace2d5792bc4f396bac01d | |
| parent | 8f22127cc79b3e6c530d935ab3ea1265b82ef893 (diff) | |
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.
| -rw-r--r-- | sys/net/ifq.c | 5 |
1 files changed, 1 insertions, 4 deletions
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; |