summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2015-04-01 14:29:54 +0000
committermpi <mpi@openbsd.org>2015-04-01 14:29:54 +0000
commitc959a36229fb755bf40db14fdd4dfebdae15e2a4 (patch)
treea7a618b247bb46dc9d42a592c02442dc2f47ab4f
parentRemove annoying comment mentionning ether_output(). (diff)
downloadwireguard-openbsd-c959a36229fb755bf40db14fdd4dfebdae15e2a4.tar.xz
wireguard-openbsd-c959a36229fb755bf40db14fdd4dfebdae15e2a4.zip
Kill useless comments talking about ether_input().
-rw-r--r--sys/dev/ic/dp8390.c6
-rw-r--r--sys/dev/pci/if_tl.c19
-rw-r--r--sys/net/if_tun.c4
3 files changed, 9 insertions, 20 deletions
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index 11c80189fdb..b2104bb6061 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dp8390.c,v 1.49 2015/03/14 03:38:47 jsg Exp $ */
+/* $OpenBSD: dp8390.c,v 1.50 2015/04/01 14:29:54 mpi Exp $ */
/* $NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $ */
/*
@@ -859,10 +859,6 @@ dp8390_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
return (error);
}
-/*
- * Retrieve packet from buffer memory and send to the next level up via
- * ether_input(). If there is a BPF listener, give a copy to BPF, too.
- */
void
dp8390_read(struct dp8390_softc *sc, int buf, u_short len)
{
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index bd8dcb61b0d..36b9e7ae4a7 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tl.c,v 1.61 2014/12/22 02:28:52 tedu Exp $ */
+/* $OpenBSD: if_tl.c,v 1.62 2015/04/01 14:29:54 mpi Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -1014,10 +1014,11 @@ tl_newbuf(struct tl_softc *sc, struct tl_chain_onefrag *c)
*
* To make things as fast as possible, we have the chip DMA directly
* into mbufs. This saves us from having to do a buffer copy: we can
- * just hand the mbufs directly to ether_input(). Once the frame has
- * been sent on its way, the 'list' structure is assigned a new buffer
- * and moved to the end of the RX chain. As long we we stay ahead of
- * the chip, it will always think it has an endless receive channel.
+ * just hand the mbufs directly to the network stack. Once the frame
+ * has been sent on its way, the 'list' structure is assigned a new
+ * buffer and moved to the end of the RX chain. As long we we stay
+ * ahead of the chip, it will always think it has an endless receive
+ * channel.
*
* If we happen to fall behind and the chip manages to fill up all of
* the buffers, it will generate an end of channel interrupt and wait
@@ -1076,14 +1077,6 @@ tl_intvec_rxeof(void *xsc, u_int32_t type)
m->m_pkthdr.len = m->m_len = total_len;
#if NBPFILTER > 0
- /*
- * Handle BPF listeners. Let the BPF user see the packet, but
- * don't pass it up to the ether_input() layer unless it's
- * a broadcast packet, multicast packet, matches our ethernet
- * address or the interface is in promiscuous mode. If we don't
- * want the packet, just forget it. We leave the mbuf in place
- * since it can be used again later.
- */
if (ifp->if_bpf)
bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_IN);
#endif
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index db5b8335734..6bea0923eac 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tun.c,v 1.134 2015/03/18 12:23:15 dlg Exp $ */
+/* $OpenBSD: if_tun.c,v 1.135 2015/04/01 14:29:54 mpi Exp $ */
/* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */
/*
@@ -872,7 +872,7 @@ tunwrite(dev_t dev, struct uio *uio, int ioflag)
ether_input_mbuf(ifp, top);
splx(s);
- ifp->if_ipackets++; /* ibytes are counted in ether_input */
+ ifp->if_ipackets++;
return (0);
}