svn commit: r289753 - head/sys/dev/usb/wlan
Andriy Voskoboinyk
avos at FreeBSD.org
Thu Oct 22 12:15:41 UTC 2015
Author: avos
Date: Thu Oct 22 12:15:40 2015
New Revision: 289753
URL: https://svnweb.freebsd.org/changeset/base/289753
Log:
Initialize radiotap header fields before calling ieee80211_radiotap_rx()
Reviewed by: kevlo
Approved by: adrian (mentor)
Differential Revision: https://reviews.freebsd.org/D3951
Modified:
head/sys/dev/usb/wlan/if_run.c
Modified: head/sys/dev/usb/wlan/if_run.c
==============================================================================
--- head/sys/dev/usb/wlan/if_run.c Thu Oct 22 11:09:25 2015 (r289752)
+++ head/sys/dev/usb/wlan/if_run.c Thu Oct 22 12:15:40 2015 (r289753)
@@ -2847,13 +2847,6 @@ run_rx_frame(struct run_softc *sc, struc
m->m_pkthdr.len = m->m_len = len;
- if (ni != NULL) {
- (void)ieee80211_input(ni, m, rssi, nf);
- ieee80211_free_node(ni);
- } else {
- (void)ieee80211_input_all(ic, m, rssi, nf);
- }
-
if (__predict_false(ieee80211_radiotap_active(ic))) {
struct run_rx_radiotap_header *tap = &sc->sc_rxtap;
uint16_t phy;
@@ -2892,6 +2885,13 @@ run_rx_frame(struct run_softc *sc, struc
break;
}
}
+
+ if (ni != NULL) {
+ (void)ieee80211_input(ni, m, rssi, nf);
+ ieee80211_free_node(ni);
+ } else {
+ (void)ieee80211_input_all(ic, m, rssi, nf);
+ }
}
static void
More information about the svn-src-head
mailing list