diff options
| author |   mpi <mpi@openbsd.org> | 2015-02-10 23:25:46 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2015-02-10 23:25:46 +0000 |
| commit | 64fa60b726070c3ee9bd902e18bd8f61e914eb8e (patch) | |
| tree | 685db0f1bd5669d9e0420ef32d7355a51a7d1c61 /sys/dev/pci | |
| parent | Convert tsleep(9)/wakeup(9) usages. (diff) | |
| download | wireguard-openbsd-64fa60b726070c3ee9bd902e18bd8f61e914eb8e.tar.xz wireguard-openbsd-64fa60b726070c3ee9bd902e18bd8f61e914eb8e.zip | |
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@
Diffstat (limited to 'sys/dev/pci')
| -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 |
5 files changed, 5 insertions, 11 deletions
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); |