Now that ieee80211_input() calls if_input() there's no need to set the
`rcvif' pointer befotre. This shrinks my conversion diff :)
ok?
Index: ic/acx.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/acx.c,v
retrieving revision 1.109
diff -u -p -r1.109 acx.c
--- ic/acx.c 22 Dec 2014 02:28:51 -0000 1.109
+++ ic/acx.c 10 Feb 2015 03:05:46 -0000
@@ -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) {
Index: ic/an.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/an.c,v
retrieving revision 1.63
diff -u -p -r1.63 an.c
--- ic/an.c 22 Dec 2014 02:28:51 -0000 1.63
+++ ic/an.c 10 Feb 2015 03:05:54 -0000
@@ -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
Index: ic/ar5008.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/ar5008.c,v
retrieving revision 1.27
diff -u -p -r1.27 ar5008.c
--- ic/ar5008.c 19 Dec 2014 22:44:58 -0000 1.27
+++ ic/ar5008.c 10 Feb 2015 03:05:57 -0000
@@ -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. */
Index: ic/ar9003.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/ar9003.c,v
retrieving revision 1.31
diff -u -p -r1.31 ar9003.c
--- ic/ar9003.c 19 Dec 2014 22:44:58 -0000 1.31
+++ ic/ar9003.c 10 Feb 2015 03:06:03 -0000
@@ -1009,7 +1009,6 @@ ar9003_rx_process(struct athn_softc *sc,
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;
Index: ic/ath.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/ath.c,v
retrieving revision 1.103
diff -u -p -r1.103 ath.c
--- ic/ath.c 22 Dec 2014 02:28:51 -0000 1.103
+++ ic/ath.c 10 Feb 2015 03:03:57 -0000
@@ -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
Index: ic/atw.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/atw.c,v
retrieving revision 1.85
diff -u -p -r1.85 atw.c
--- ic/atw.c 22 Dec 2014 02:28:51 -0000 1.85
+++ ic/atw.c 10 Feb 2015 03:04:25 -0000
@@ -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]))
Index: ic/bwi.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/bwi.c,v
retrieving revision 1.115
diff -u -p -r1.115 bwi.c
--- ic/bwi.c 10 Jan 2015 10:45:46 -0000 1.115
+++ ic/bwi.c 10 Feb 2015 02:59:35 -0000
@@ -8436,7 +8436,6 @@ bwi_rxeof(struct bwi_softc *sc, int end_
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);
Index: ic/malo.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/malo.c,v
retrieving revision 1.104
diff -u -p -r1.104 malo.c
--- ic/malo.c 22 Dec 2014 02:28:51 -0000 1.104
+++ ic/malo.c 10 Feb 2015 03:08:35 -0000
@@ -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);
/*
Index: ic/rt2560.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/rt2560.c,v
retrieving revision 1.69
diff -u -p -r1.69 rt2560.c
--- ic/rt2560.c 22 Dec 2014 02:28:51 -0000 1.69
+++ ic/rt2560.c 10 Feb 2015 03:03:33 -0000
@@ -1165,7 +1165,6 @@ rt2560_decryption_intr(struct rt2560_sof
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;
Index: ic/rt2661.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/rt2661.c,v
retrieving revision 1.78
diff -u -p -r1.78 rt2661.c
--- ic/rt2661.c 22 Dec 2014 02:28:51 -0000 1.78
+++ ic/rt2661.c 10 Feb 2015 03:03:42 -0000
@@ -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;
Index: ic/rt2860.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/rt2860.c,v
retrieving revision 1.78
diff -u -p -r1.78 rt2860.c
--- ic/rt2860.c 22 Dec 2014 02:28:51 -0000 1.78
+++ ic/rt2860.c 10 Feb 2015 03:04:47 -0000
@@ -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;
Index: ic/rtw.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/rtw.c,v
retrieving revision 1.89
diff -u -p -r1.89 rtw.c
--- ic/rtw.c 22 Dec 2014 02:28:51 -0000 1.89
+++ ic/rtw.c 10 Feb 2015 03:02:44 -0000
@@ -1237,7 +1237,6 @@ rtw_intr_rx(struct rtw_softc *sc, u_int1
* 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 *);
Index: pci/if_ipw.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_ipw.c,v
retrieving revision 1.106
diff -u -p -r1.106 if_ipw.c
--- pci/if_ipw.c 27 Jan 2015 04:49:01 -0000 1.106
+++ pci/if_ipw.c 10 Feb 2015 03:08:37 -0000
@@ -879,7 +879,6 @@ ipw_data_intr(struct ipw_softc *sc, stru
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
Index: pci/if_iwi.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_iwi.c,v
retrieving revision 1.122
diff -u -p -r1.122 if_iwi.c
--- pci/if_iwi.c 27 Jan 2015 03:17:36 -0000 1.122
+++ pci/if_iwi.c 10 Feb 2015 02:59:44 -0000
@@ -923,7 +923,6 @@ iwi_frame_intr(struct iwi_softc *sc, str
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));
Index: pci/if_iwm.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_iwm.c,v
retrieving revision 1.9
diff -u -p -r1.9 if_iwm.c
--- pci/if_iwm.c 9 Feb 2015 03:51:59 -0000 1.9
+++ pci/if_iwm.c 10 Feb 2015 02:59:03 -0000
@@ -3081,8 +3081,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)];
Index: pci/if_iwn.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_iwn.c,v
retrieving revision 1.139
diff -u -p -r1.139 if_iwn.c
--- pci/if_iwn.c 8 Feb 2015 13:45:57 -0000 1.139
+++ pci/if_iwn.c 10 Feb 2015 02:58:29 -0000
@@ -2002,7 +2002,6 @@ iwn_rx_done(struct iwn_softc *sc, struct
BUS_DMASYNC_PREWRITE);
/* Finalize mbuf. */
- m->m_pkthdr.rcvif = ifp;
m->m_data = head;
m->m_pkthdr.len = m->m_len = len;
Index: pci/if_wpi.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_wpi.c,v
retrieving revision 1.123
diff -u -p -r1.123 if_wpi.c
--- pci/if_wpi.c 27 Jan 2015 03:17:36 -0000 1.123
+++ pci/if_wpi.c 10 Feb 2015 02:59:11 -0000
@@ -1254,7 +1254,6 @@ wpi_rx_done(struct wpi_softc *sc, struct
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);
Index: usb/if_athn_usb.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_athn_usb.c,v
retrieving revision 1.25
diff -u -p -r1.25 if_athn_usb.c
--- usb/if_athn_usb.c 22 Dec 2014 02:28:52 -0000 1.25
+++ usb/if_athn_usb.c 10 Feb 2015 03:08:40 -0000
@@ -1680,7 +1680,6 @@ athn_usb_rx_frame(struct athn_usb_softc
goto skip;
m_adj(m, sizeof(*rs)); /* Strip Rx status. */
- m->m_pkthdr.rcvif = ifp;
s = splnet();
Index: usb/if_atu.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_atu.c,v
retrieving revision 1.110
diff -u -p -r1.110 if_atu.c
--- usb/if_atu.c 22 Dec 2014 02:28:52 -0000 1.110
+++ usb/if_atu.c 10 Feb 2015 03:08:42 -0000
@@ -1694,7 +1694,6 @@ atu_rxeof(struct usbd_xfer *xfer, void *
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 *);
Index: usb/if_otus.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_otus.c,v
retrieving revision 1.44
diff -u -p -r1.44 if_otus.c
--- usb/if_otus.c 22 Dec 2014 02:28:52 -0000 1.44
+++ usb/if_otus.c 10 Feb 2015 03:08:43 -0000
@@ -1143,7 +1143,6 @@ otus_sub_rxeof(struct otus_softc *sc, ui
}
}
/* 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;
Index: usb/if_ral.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_ral.c,v
retrieving revision 1.130
diff -u -p -r1.130 if_ral.c
--- usb/if_ral.c 22 Dec 2014 02:28:52 -0000 1.130
+++ usb/if_ral.c 10 Feb 2015 03:08:45 -0000
@@ -767,7 +767,6 @@ ural_rxeof(struct usbd_xfer *xfer, void
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();
Index: usb/if_rsu.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_rsu.c,v
retrieving revision 1.24
diff -u -p -r1.24 if_rsu.c
--- usb/if_rsu.c 22 Dec 2014 02:28:52 -0000 1.24
+++ usb/if_rsu.c 10 Feb 2015 03:09:03 -0000
@@ -1118,7 +1118,6 @@ rsu_event_survey(struct rsu_softc *sc, u
/* 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
}
}
/* 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))
Index: usb/if_rum.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_rum.c,v
retrieving revision 1.108
diff -u -p -r1.108 if_rum.c
--- usb/if_rum.c 22 Dec 2014 02:28:52 -0000 1.108
+++ usb/if_rum.c 10 Feb 2015 03:01:40 -0000
@@ -839,7 +839,6 @@ rum_rxeof(struct usbd_xfer *xfer, void *
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;
Index: usb/if_run.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_run.c,v
retrieving revision 1.106
diff -u -p -r1.106 if_run.c
--- usb/if_run.c 22 Dec 2014 02:28:52 -0000 1.106
+++ usb/if_run.c 10 Feb 2015 03:01:45 -0000
@@ -2243,7 +2243,6 @@ run_rx_frame(struct run_softc *sc, uint8
}
}
/* finalize mbuf */
- m->m_pkthdr.rcvif = ifp;
memcpy(mtod(m, caddr_t), wh, len);
m->m_pkthdr.len = m->m_len = len;
Index: usb/if_uath.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_uath.c,v
retrieving revision 1.65
diff -u -p -r1.65 if_uath.c
--- usb/if_uath.c 22 Dec 2014 02:28:52 -0000 1.65
+++ usb/if_uath.c 10 Feb 2015 03:08:51 -0000
@@ -1221,7 +1221,6 @@ uath_data_rxeof(struct usbd_xfer *xfer,
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;
Index: usb/if_urtw.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_urtw.c,v
retrieving revision 1.50
diff -u -p -r1.50 if_urtw.c
--- usb/if_urtw.c 22 Dec 2014 02:28:52 -0000 1.50
+++ usb/if_urtw.c 10 Feb 2015 03:01:22 -0000
@@ -3166,7 +3166,6 @@ urtw_rxeof(struct usbd_xfer *xfer, void
data->buf = mtod(mnew, uint8_t *);
/* finalize mbuf */
- m->m_pkthdr.rcvif = ifp;
m->m_pkthdr.len = m->m_len = flen - 4;
s = splnet();
Index: usb/if_urtwn.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_urtwn.c,v
retrieving revision 1.41
diff -u -p -r1.41 if_urtwn.c
--- usb/if_urtwn.c 7 Feb 2015 21:21:44 -0000 1.41
+++ usb/if_urtwn.c 10 Feb 2015 03:01:33 -0000
@@ -1565,7 +1565,6 @@ urtwn_rx_frame(struct urtwn_softc *sc, u
}
}
/* 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;
Index: usb/if_zyd.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_zyd.c,v
retrieving revision 1.106
diff -u -p -r1.106 if_zyd.c
--- usb/if_zyd.c 22 Dec 2014 02:28:52 -0000 1.106
+++ usb/if_zyd.c 10 Feb 2015 03:08:54 -0000
@@ -1953,7 +1953,6 @@ zyd_rx_data(struct zyd_softc *sc, const
}
}
bcopy(plcp + 1, mtod(m, caddr_t), len);
- m->m_pkthdr.rcvif = ifp;
m->m_pkthdr.len = m->m_len = len;
#if NBPFILTER > 0
