diff options
-rw-r--r-- | sys/dev/ic/acx.c | 3 | ||||
-rw-r--r-- | sys/dev/ic/an.c | 3 | ||||
-rw-r--r-- | sys/dev/ic/ar5008.c | 3 | ||||
-rw-r--r-- | sys/dev/ic/ar9003.c | 3 | ||||
-rw-r--r-- | sys/dev/ic/ath.c | 3 | ||||
-rw-r--r-- | sys/dev/ic/atw.c | 3 | ||||
-rw-r--r-- | sys/dev/ic/bwi.c | 3 | ||||
-rw-r--r-- | sys/dev/ic/malo.c | 3 | ||||
-rw-r--r-- | sys/dev/ic/rt2560.c | 3 | ||||
-rw-r--r-- | sys/dev/ic/rt2661.c | 3 | ||||
-rw-r--r-- | sys/dev/ic/rt2860.c | 3 | ||||
-rw-r--r-- | sys/dev/ic/rtw.c | 3 | ||||
-rw-r--r-- | sys/dev/pci/if_ipw.c | 3 | ||||
-rw-r--r-- | sys/dev/pci/if_iwi.c | 3 | ||||
-rw-r--r-- | sys/dev/pci/if_iwm.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/if_iwn.c | 3 | ||||
-rw-r--r-- | sys/dev/pci/if_wpi.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/if_athn_usb.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/if_atu.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/if_otus.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/if_ral.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/if_rsu.c | 4 | ||||
-rw-r--r-- | sys/dev/usb/if_rum.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/if_run.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/if_uath.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/if_urtw.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/if_urtwn.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/if_zyd.c | 3 |
28 files changed, 28 insertions, 58 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 *); diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c index 3a205e2e6cc..d0305e32f48 100644 --- a/sys/dev/pci/if_ipw.c +++ b/sys/dev/pci/if_ipw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ipw.c,v 1.106 2015/01/27 04:49:01 dlg Exp $ */ +/* $OpenBSD: if_ipw.c,v 1.107 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2004-2008 @@ -879,7 +879,6 @@ ipw_data_intr(struct ipw_softc *sc, struct ipw_status *status, sbd->bd->physaddr = htole32(sbuf->map->dm_segs[0].ds_addr); /* finalize mbuf */ - m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = letoh32(status->len); #if NBPFILTER > 0 diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index 24645c5d36e..303c53ad4ca 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwi.c,v 1.122 2015/01/27 03:17:36 dlg Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.123 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2004-2008 @@ -923,7 +923,6 @@ iwi_frame_intr(struct iwi_softc *sc, struct iwi_rx_data *data, CSR_WRITE_4(sc, data->reg, data->map->dm_segs[0].ds_addr); /* finalize mbuf */ - m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = sizeof (struct iwi_hdr) + sizeof (struct iwi_frame) + letoh16(frame->len); m_adj(m, sizeof (struct iwi_hdr) + sizeof (struct iwi_frame)); diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index 1ecd288741a..e0b2f820607 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.13 2015/02/10 22:32:04 stsp Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.14 2015/02/10 23:25:46 mpi Exp $ */ /* * Copyright (c) 2014 genua mbh <info@genua.de> @@ -3064,8 +3064,6 @@ iwm_mvm_rx_rx_mpdu(struct iwm_softc *sc, if (iwm_rx_addbuf(sc, IWM_RBUF_SIZE, sc->rxq.cur) != 0) return; - m->m_pkthdr.rcvif = IC2IFP(ic); - if (sc->sc_scanband == IEEE80211_CHAN_5GHZ) { if (le32toh(phy_info->channel) < nitems(ic->ic_channels)) c = &ic->ic_channels[le32toh(phy_info->channel)]; diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index a73cf1fe891..ce16e335b8c 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.139 2015/02/08 13:45:57 stsp Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.140 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -2002,7 +2002,6 @@ iwn_rx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc, BUS_DMASYNC_PREWRITE); /* Finalize mbuf. */ - m->m_pkthdr.rcvif = ifp; m->m_data = head; m->m_pkthdr.len = m->m_len = len; diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 40957698ff1..8ece21e9873 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.123 2015/01/27 03:17:36 dlg Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.124 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2006-2008 @@ -1254,7 +1254,6 @@ wpi_rx_done(struct wpi_softc *sc, struct wpi_rx_desc *desc, BUS_DMASYNC_PREWRITE); /* Finalize mbuf. */ - m->m_pkthdr.rcvif = ifp; m->m_data = (caddr_t)(head + 1); m->m_pkthdr.len = m->m_len = letoh16(head->len); diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c index 52880fc7c66..09411158436 100644 --- a/sys/dev/usb/if_athn_usb.c +++ b/sys/dev/usb/if_athn_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_athn_usb.c,v 1.25 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_athn_usb.c,v 1.26 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr> @@ -1680,7 +1680,6 @@ athn_usb_rx_frame(struct athn_usb_softc *usc, struct mbuf *m) goto skip; m_adj(m, sizeof(*rs)); /* Strip Rx status. */ - m->m_pkthdr.rcvif = ifp; s = splnet(); diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c index d39adb9fd73..77939bc9946 100644 --- a/sys/dev/usb/if_atu.c +++ b/sys/dev/usb/if_atu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atu.c,v 1.110 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_atu.c,v 1.111 2015/02/10 23:25:46 mpi Exp $ */ /* * Copyright (c) 2003, 2004 * Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved. @@ -1694,7 +1694,6 @@ atu_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status) m = c->atu_mbuf; memcpy(mtod(m, char *), c->atu_buf + ATU_RX_HDRLEN, len); - m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = len; wh = mtod(m, struct ieee80211_frame *); diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c index 449cca3b3c2..f0c79356917 100644 --- a/sys/dev/usb/if_otus.c +++ b/sys/dev/usb/if_otus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_otus.c,v 1.44 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_otus.c,v 1.45 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -1143,7 +1143,6 @@ otus_sub_rxeof(struct otus_softc *sc, uint8_t *buf, int len) } } /* Finalize mbuf. */ - m->m_pkthdr.rcvif = ifp; m->m_data += align; memcpy(mtod(m, caddr_t), wh, mlen); m->m_pkthdr.len = m->m_len = mlen; diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c index debea192c77..ca953202a33 100644 --- a/sys/dev/usb/if_ral.c +++ b/sys/dev/usb/if_ral.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral.c,v 1.130 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_ral.c,v 1.131 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -767,7 +767,6 @@ ural_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status) data->buf = mtod(data->m, uint8_t *); /* finalize mbuf */ - m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = (letoh32(desc->flags) >> 16) & 0xfff; s = splnet(); diff --git a/sys/dev/usb/if_rsu.c b/sys/dev/usb/if_rsu.c index 85477185051..60a64c12fd1 100644 --- a/sys/dev/usb/if_rsu.c +++ b/sys/dev/usb/if_rsu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rsu.c,v 1.24 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_rsu.c,v 1.25 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -1118,7 +1118,6 @@ rsu_event_survey(struct rsu_softc *sc, uint8_t *buf, int len) /* Finalize mbuf. */ m->m_pkthdr.len = m->m_len = pktlen; - m->m_pkthdr.rcvif = ifp; ni = ieee80211_find_rxnode(ic, wh); rxi.rxi_flags = 0; @@ -1313,7 +1312,6 @@ rsu_rx_frame(struct rsu_softc *sc, uint8_t *buf, int pktlen) } } /* Finalize mbuf. */ - m->m_pkthdr.rcvif = ifp; /* Hardware does Rx TCP checksum offload. */ if (rxdw3 & R92S_RXDW3_TCPCHKVALID) { if (__predict_true(rxdw3 & R92S_RXDW3_TCPCHKRPT)) diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index fea05a45958..bbfebf5449d 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rum.c,v 1.108 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_rum.c,v 1.109 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -839,7 +839,6 @@ rum_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status) data->buf = mtod(data->m, uint8_t *); /* finalize mbuf */ - m->m_pkthdr.rcvif = ifp; m->m_data = (caddr_t)(desc + 1); m->m_pkthdr.len = m->m_len = (letoh32(desc->flags) >> 16) & 0xfff; diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c index 28ac71a5cf9..390af789e3f 100644 --- a/sys/dev/usb/if_run.c +++ b/sys/dev/usb/if_run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_run.c,v 1.106 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_run.c,v 1.107 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -2243,7 +2243,6 @@ run_rx_frame(struct run_softc *sc, uint8_t *buf, int dmalen) } } /* finalize mbuf */ - m->m_pkthdr.rcvif = ifp; memcpy(mtod(m, caddr_t), wh, len); m->m_pkthdr.len = m->m_len = len; diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index 6fd5fe813a0..3dd7afb93a7 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.65 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_uath.c,v 1.66 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2006 @@ -1221,7 +1221,6 @@ uath_data_rxeof(struct usbd_xfer *xfer, void *priv, data->m = mnew; /* finalize mbuf */ - m->m_pkthdr.rcvif = ifp; m->m_data = data->buf + sizeof (uint32_t); m->m_pkthdr.len = m->m_len = betoh32(desc->len) - sizeof (struct uath_rx_desc) - IEEE80211_CRC_LEN; diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c index 4c169b38750..65ffdff2e17 100644 --- a/sys/dev/usb/if_urtw.c +++ b/sys/dev/usb/if_urtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtw.c,v 1.50 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_urtw.c,v 1.51 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org> @@ -3166,7 +3166,6 @@ urtw_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status) data->buf = mtod(mnew, uint8_t *); /* finalize mbuf */ - m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = flen - 4; s = splnet(); diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c index 5ae276fd39f..38b7b11bcb5 100644 --- a/sys/dev/usb/if_urtwn.c +++ b/sys/dev/usb/if_urtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtwn.c,v 1.41 2015/02/07 21:21:44 mpi Exp $ */ +/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -1565,7 +1565,6 @@ urtwn_rx_frame(struct urtwn_softc *sc, uint8_t *buf, int pktlen) } } /* Finalize mbuf. */ - m->m_pkthdr.rcvif = ifp; wh = (struct ieee80211_frame *)((uint8_t *)&stat[1] + infosz); memcpy(mtod(m, uint8_t *), wh, pktlen); m->m_pkthdr.len = m->m_len = pktlen; diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index 74e7c6230a5..6b93a4b995d 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_zyd.c,v 1.106 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_zyd.c,v 1.107 2015/02/10 23:25:46 mpi Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -1953,7 +1953,6 @@ zyd_rx_data(struct zyd_softc *sc, const uint8_t *buf, uint16_t len) } } bcopy(plcp + 1, mtod(m, caddr_t), len); - m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = len; #if NBPFILTER > 0 |