Wireless drivers call if_input() via ieee80211_input() which set `rcvif'

on every received mbuf, so there's no need to initialize this pointer in
the drivers.

Tested by and ok phessler@

12 files changed, 12 insertions, 24 deletions

diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index 1be5f3da6e3..6bd03202bab 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx.c,v 1.109 2014/12/22 02:28:51 tedu Exp $ */
+/*	$OpenBSD: acx.c,v 1.110 2015/02/10 23:25:46 mpi Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -1388,7 +1388,6 @@ acx_rxeof(struct acx_softc *sc)
 			}
 
 			m->m_len = m->m_pkthdr.len = len;
-			m->m_pkthdr.rcvif = &ic->ic_if;
 
 #if NBPFILTER > 0
 			if (sc->sc_drvbpf != NULL) {
diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index c37be3ee3ce..e3e1d6452d7 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: an.c,v 1.63 2014/12/22 02:28:51 tedu Exp $	*/
+/*	$OpenBSD: an.c,v 1.64 2015/02/10 23:25:46 mpi Exp $	*/
 /*	$NetBSD: an.c,v 1.34 2005/06/20 02:49:18 atatat Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -441,7 +441,6 @@ an_rxeof(struct an_softc *sc)
 	    len;
 
 	memcpy(m->m_data, &frmhdr.an_whdr, sizeof(struct ieee80211_frame));
-	m->m_pkthdr.rcvif = ifp;
 	CSR_WRITE_2(sc, AN_EVENT_ACK, AN_EV_RX);
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ar5008.c b/sys/dev/ic/ar5008.c
index 1dff6d5a722..b571b33e49a 100644
--- a/sys/dev/ic/ar5008.c
+++ b/sys/dev/ic/ar5008.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5008.c,v 1.27 2014/12/19 22:44:58 guenther Exp $	*/
+/*	$OpenBSD: ar5008.c,v 1.28 2015/02/10 23:25:46 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -893,7 +893,6 @@ ar5008_rx_process(struct athn_softc *sc)
 	bf->bf_m = m1;
 
 	/* Finalize mbuf. */
-	m->m_pkthdr.rcvif = ifp;
 	m->m_pkthdr.len = m->m_len = len;
 
 	/* Grab a reference to the source node. */
diff --git a/sys/dev/ic/ar9003.c b/sys/dev/ic/ar9003.c
index 4f4195fb4d8..700bebaad02 100644
--- a/sys/dev/ic/ar9003.c
+++ b/sys/dev/ic/ar9003.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9003.c,v 1.31 2014/12/19 22:44:58 guenther Exp $	*/
+/*	$OpenBSD: ar9003.c,v 1.32 2015/02/10 23:25:46 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1009,7 +1009,6 @@ ar9003_rx_process(struct athn_softc *sc, int qid)
 	bf->bf_m = m1;
 
 	/* Finalize mbuf. */
-	m->m_pkthdr.rcvif = ifp;
 	/* Strip Rx status descriptor from head. */
 	m->m_data = (caddr_t)&ds[1];
 	m->m_pkthdr.len = m->m_len = len;
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 23aa8751001..a7727918f8d 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ath.c,v 1.103 2014/12/22 02:28:51 tedu Exp $  */
+/*      $OpenBSD: ath.c,v 1.104 2015/02/10 23:25:46 mpi Exp $  */
 /*	$NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $	*/
 
 /*-
@@ -1954,7 +1954,6 @@ ath_rx_proc(void *arg, int npending)
 
 		bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap);
 		bf->bf_m = NULL;
-		m->m_pkthdr.rcvif = ifp;
 		m->m_pkthdr.len = m->m_len = len;
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c
index e7ee8c24717..1e4dea9d594 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atw.c,v 1.85 2014/12/22 02:28:51 tedu Exp $	*/
+/*	$OpenBSD: atw.c,v 1.86 2015/02/10 23:25:46 mpi Exp $	*/
 /*	$NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -3129,7 +3129,6 @@ atw_rxintr(struct atw_softc *sc)
 
 		if (sc->sc_opmode & ATW_NAR_PR)
 			len -= IEEE80211_CRC_LEN;
-		m->m_pkthdr.rcvif = ifp;
 		m->m_pkthdr.len = m->m_len = MIN(m->m_ext.ext_size, len);
 
 		if (rate0 >= sizeof(rate_tbl) / sizeof(rate_tbl[0]))
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 55302a8d34a..c5f30307681 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwi.c,v 1.115 2015/01/10 10:45:46 stsp Exp $	*/
+/*	$OpenBSD: bwi.c,v 1.116 2015/02/10 23:25:46 mpi Exp $	*/
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -8436,7 +8436,6 @@ bwi_rxeof(struct bwi_softc *sc, int end_idx)
 		bcopy((uint8_t *)(hdr + 1) + hdr_extra, &plcp, sizeof(plcp));
 		rssi = bwi_calc_rssi(sc, hdr);
 
-		m->m_pkthdr.rcvif = ifp;
 		m->m_len = m->m_pkthdr.len = buflen + sizeof(*hdr);
 		m_adj(m, sizeof(*hdr) + wh_ofs);
 
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index f22c8d5d34b..ebe442ddcd3 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malo.c,v 1.104 2014/12/22 02:28:51 tedu Exp $ */
+/*	$OpenBSD: malo.c,v 1.105 2015/02/10 23:25:46 mpi Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -1690,7 +1690,6 @@ malo_rx_intr(struct malo_softc *sc)
 		desc->physdata = htole32(data->map->dm_segs->ds_addr);
 
 		/* finalize mbuf */
-		m->m_pkthdr.rcvif = ifp;
 		m->m_pkthdr.len = m->m_len = letoh16(desc->len);
 
 		/*
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index 431a9db86d2..206a0ec95b3 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2560.c,v 1.69 2014/12/22 02:28:51 tedu Exp $  */
+/*	$OpenBSD: rt2560.c,v 1.70 2015/02/10 23:25:46 mpi Exp $  */
 
 /*-
  * Copyright (c) 2005, 2006
@@ -1165,7 +1165,6 @@ rt2560_decryption_intr(struct rt2560_softc *sc)
 		desc->physaddr = htole32(data->map->dm_segs->ds_addr);
 
 		/* finalize mbuf */
-		m->m_pkthdr.rcvif = ifp;
 		m->m_pkthdr.len = m->m_len =
 		    (letoh32(desc->flags) >> 16) & 0xfff;
 
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 1e57f540bad..dd17032c366 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2661.c,v 1.78 2014/12/22 02:28:51 tedu Exp $	*/
+/*	$OpenBSD: rt2661.c,v 1.79 2015/02/10 23:25:46 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -1248,7 +1248,6 @@ rt2661_rx_intr(struct rt2661_softc *sc)
 		desc->physaddr = htole32(data->map->dm_segs->ds_addr);
 
 		/* finalize mbuf */
-		m->m_pkthdr.rcvif = ifp;
 		m->m_pkthdr.len = m->m_len =
 		    (letoh32(desc->flags) >> 16) & 0xfff;
 
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index e1a1724d252..caf7a437639 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2860.c,v 1.78 2014/12/22 02:28:51 tedu Exp $	*/
+/*	$OpenBSD: rt2860.c,v 1.79 2015/02/10 23:25:46 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1292,7 +1292,6 @@ rt2860_rx_intr(struct rt2860_softc *sc)
 		rxwi = mtod(m, struct rt2860_rxwi *);
 
 		/* finalize mbuf */
-		m->m_pkthdr.rcvif = ifp;
 		m->m_data = (caddr_t)(rxwi + 1);
 		m->m_pkthdr.len = m->m_len = letoh16(rxwi->len) & 0xfff;
 
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index 1e560717ec8..3e0155781ed 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtw.c,v 1.89 2014/12/22 02:28:51 tedu Exp $	*/
+/*	$OpenBSD: rtw.c,v 1.90 2015/02/10 23:25:46 mpi Exp $	*/
 /*	$NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */
 
 /*-
@@ -1237,7 +1237,6 @@ rtw_intr_rx(struct rtw_softc *sc, u_int16_t isr)
 		 * Note well: now we cannot recycle the rs_mbuf unless
 		 * we restore its original length.
 		 */
-		m->m_pkthdr.rcvif = &sc->sc_if;
 		m->m_pkthdr.len = m->m_len = len;
 
 		wh = mtod(m, struct ieee80211_frame *);