Author: avos Date: Tue Jan 12 00:12:18 2016 New Revision: 293714 URL: https://svnweb.freebsd.org/changeset/base/293714
Log: rtwn: import r290022 (do not filter out control frames in the RX path) Tested by: kevlo Reviewed by: kevlo Approved by: adrian (mentor) Differential Revision: https://reviews.freebsd.org/D4838 Modified: head/sys/dev/rtwn/if_rtwn.c Modified: head/sys/dev/rtwn/if_rtwn.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn.c Tue Jan 12 00:07:26 2016 (r293713) +++ head/sys/dev/rtwn/if_rtwn.c Tue Jan 12 00:12:18 2016 (r293714) @@ -1438,7 +1438,7 @@ rtwn_rx_frame(struct rtwn_softc *sc, str struct rtwn_rx_data *rx_data, int desc_idx) { struct ieee80211com *ic = &sc->sc_ic; - struct ieee80211_frame *wh; + struct ieee80211_frame_min *wh; struct ieee80211_node *ni; struct r92c_rx_phystat *phy = NULL; uint32_t rxdw0, rxdw3; @@ -1462,7 +1462,8 @@ rtwn_rx_frame(struct rtwn_softc *sc, str } pktlen = MS(rxdw0, R92C_RXDW0_PKTLEN); - if (__predict_false(pktlen < sizeof(*wh) || pktlen > MCLBYTES)) { + if (__predict_false(pktlen < sizeof(struct ieee80211_frame_ack) || + pktlen > MCLBYTES)) { counter_u64_add(ic->ic_ierrors, 1); return; } @@ -1554,10 +1555,13 @@ rtwn_rx_frame(struct rtwn_softc *sc, str } RTWN_UNLOCK(sc); - wh = mtod(m, struct ieee80211_frame *); + wh = mtod(m, struct ieee80211_frame_min *); + if (m->m_len >= sizeof(*wh)) + ni = ieee80211_find_rxnode(ic, wh); + else + ni = NULL; /* Send the frame to the 802.11 layer. */ - ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); if (ni != NULL) { (void)ieee80211_input(ni, m, rssi - nf, nf); /* Node is no longer needed. */ _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
