summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2019-03-29 04:12:56 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2019-03-29 04:12:56 +0000
commit773a4555f559222f3571db60878fa5c3a27c4b0a (patch)
tree5413e8bfdf1a8d3dfa16b428cd4b8a67d08c1eab /sys/net
parent3dc290e5cfa30658987ff88e9dc5209e3984baeb (diff)
deprecate ifiq_barrier.
drivers don't need to call it because the stack runs work in ifiqs. again, only the stack has to care about waiting for pending work when shutting down, not drivers. ifiq_destroy already does a task_del and task_barrier dance, so we don't need ifiq_barrier.
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/ifq.c9
-rw-r--r--sys/net/ifq.h3
2 files changed, 2 insertions, 10 deletions
diff --git a/sys/net/ifq.c b/sys/net/ifq.c
index a43716563e5..9e17c229eb1 100644
--- a/sys/net/ifq.c
+++ b/sys/net/ifq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ifq.c,v 1.28 2019/03/04 21:57:16 dlg Exp $ */
+/* $OpenBSD: ifq.c,v 1.29 2019/03/29 04:12:55 dlg Exp $ */
/*
* Copyright (c) 2015 David Gwynne <dlg@openbsd.org>
@@ -545,13 +545,6 @@ ifiq_add_data(struct ifiqueue *ifiq, struct if_data *data)
mtx_leave(&ifiq->ifiq_mtx);
}
-void
-ifiq_barrier(struct ifiqueue *ifiq)
-{
- if (!task_del(ifiq->ifiq_softnet, &ifiq->ifiq_task))
- taskq_barrier(ifiq->ifiq_softnet);
-}
-
int
ifiq_enqueue(struct ifiqueue *ifiq, struct mbuf *m)
{
diff --git a/sys/net/ifq.h b/sys/net/ifq.h
index fdbfc170314..664a483950e 100644
--- a/sys/net/ifq.h
+++ b/sys/net/ifq.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ifq.h,v 1.23 2019/03/01 04:47:33 dlg Exp $ */
+/* $OpenBSD: ifq.h,v 1.24 2019/03/29 04:12:55 dlg Exp $ */
/*
* Copyright (c) 2015 David Gwynne <dlg@openbsd.org>
@@ -477,7 +477,6 @@ void ifiq_destroy(struct ifiqueue *);
int ifiq_input(struct ifiqueue *, struct mbuf_list *);
int ifiq_enqueue(struct ifiqueue *, struct mbuf *);
void ifiq_add_data(struct ifiqueue *, struct if_data *);
-void ifiq_barrier(struct ifiqueue *);
#define ifiq_len(_ifiq) ml_len(&(_ifiq)->ifiq_ml)
#define ifiq_empty(_ifiq) ml_empty(&(_ifiq)->ifiq_ml)