summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2015-06-10 15:34:17 +0000
committermpi <mpi@openbsd.org>2015-06-10 15:34:17 +0000
commitc19ee78b67c12301550c37b40331aaec05d38b64 (patch)
treed8d8af8ae08fd7be48edba0d6e729a25bf84c63e
parentwp->tty is a char [] not a char * so it can't be NULL. From Thomas Adam. (diff)
downloadwireguard-openbsd-c19ee78b67c12301550c37b40331aaec05d38b64.tar.xz
wireguard-openbsd-c19ee78b67c12301550c37b40331aaec05d38b64.zip
Do not set "rcvif", if_input() does it for us.
Found the hardway by krw@ trying a diff that kills "rcvif". ok stsp@
-rw-r--r--sys/dev/pci/if_rtwn.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/pci/if_rtwn.c b/sys/dev/pci/if_rtwn.c
index a2ce6b6fc59..19ce5f84bc0 100644
--- a/sys/dev/pci/if_rtwn.c
+++ b/sys/dev/pci/if_rtwn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_rtwn.c,v 1.1 2015/06/04 21:08:40 stsp Exp $ */
+/* $OpenBSD: if_rtwn.c,v 1.2 2015/06/10 15:34:17 mpi Exp $ */
/*-
* Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1544,7 +1544,6 @@ rtwn_rx_frame(struct rtwn_softc *sc, struct r92c_rx_desc *rx_desc,
/* Finalize mbuf. */
m = rx_data->m;
rx_data->m = m1;
- m->m_pkthdr.rcvif = ifp;
m->m_pkthdr.len = m->m_len = pktlen + infosz + shift;
/* Update RX descriptor. */