summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2015-06-02 13:23:55 +0000
committermpi <mpi@openbsd.org>2015-06-02 13:23:55 +0000
commit5dbcddf41c6b376bd11938c72aff7d5689d303e4 (patch)
treeda6b849b30f525c1eb8901990b48d6f0842cd5aa
parentUse if_input() instead of ether_input_mbuf(). (diff)
downloadwireguard-openbsd-5dbcddf41c6b376bd11938c72aff7d5689d303e4.tar.xz
wireguard-openbsd-5dbcddf41c6b376bd11938c72aff7d5689d303e4.zip
RIP ether_input_mbuf().
-rw-r--r--sys/net/if.c9
-rw-r--r--sys/net/if_var.h3
2 files changed, 2 insertions, 10 deletions
diff --git a/sys/net/if.c b/sys/net/if.c
index b59a93e2787..fc4a2c07b53 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.335 2015/05/26 11:39:07 mpi Exp $ */
+/* $OpenBSD: if.c,v 1.336 2015/06/02 13:23:55 mpi Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -504,13 +504,6 @@ if_input(struct ifnet *ifp, struct mbuf_list *ml)
}
void
-ether_input_mbuf(struct ifnet *ifp, struct mbuf *m)
-{
- mq_enqueue(&if_input_queue, m);
- task_add(softnettq, &if_input_task);
-}
-
-void
if_input_process(void *xmq)
{
struct mbuf_queue *mq = xmq;
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 52abb7eadcf..bef4cede43c 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_var.h,v 1.31 2015/05/28 11:57:33 mpi Exp $ */
+/* $OpenBSD: if_var.h,v 1.32 2015/06/02 13:23:55 mpi Exp $ */
/* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */
/*
@@ -413,7 +413,6 @@ void if_start(struct ifnet *);
int if_output(struct ifnet *, struct mbuf *);
void if_input(struct ifnet *, struct mbuf_list *);
-void ether_input_mbuf(struct ifnet *, struct mbuf *);
void ether_ifattach(struct ifnet *);
void ether_ifdetach(struct ifnet *);
int ether_ioctl(struct ifnet *, struct arpcom *, u_long, caddr_t);