diff options
| author | avos <avos@FreeBSD.org> | 2016-04-20 18:48:39 +0000 |
|---|---|---|
| committer | avos <avos@FreeBSD.org> | 2016-04-20 18:48:39 +0000 |
| commit | 87a51f6af20defab7f2e741ca2e1bcb36955e7c8 (patch) | |
| tree | 4f961cbbb98287975a3e0748366a147b8f2073de /sys/net80211 | |
| parent | a5ff8b0e316b83f9374254420658df1268d03b44 (diff) | |
| download | FreeBSD-src-87a51f6af20defab7f2e741ca2e1bcb36955e7c8.zip FreeBSD-src-87a51f6af20defab7f2e741ca2e1bcb36955e7c8.tar.gz | |
net80211 (trivial, noop): remove duplicate check from hostap_recv_mgmt()
Differential Revision: https://reviews.freebsd.org/D5483
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_hostap.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c index 308d6b3..e55c6c1 100644 --- a/sys/net80211/ieee80211_hostap.c +++ b/sys/net80211/ieee80211_hostap.c @@ -1677,18 +1677,19 @@ hostap_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, efrm = mtod(m0, uint8_t *) + m0->m_len; switch (subtype) { case IEEE80211_FC0_SUBTYPE_PROBE_RESP: - case IEEE80211_FC0_SUBTYPE_BEACON: { - struct ieee80211_scanparams scan; /* * We process beacon/probe response frames when scanning; * otherwise we check beacon frames for overlapping non-ERP * BSS in 11g and/or overlapping legacy BSS when in HT. - */ - if ((ic->ic_flags & IEEE80211_F_SCAN) == 0 && - subtype == IEEE80211_FC0_SUBTYPE_PROBE_RESP) { + */ + if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) { vap->iv_stats.is_rx_mgtdiscard++; return; } + /* FALLTHROUGH */ + case IEEE80211_FC0_SUBTYPE_BEACON: { + struct ieee80211_scanparams scan; + /* NB: accept off-channel frames */ /* XXX TODO: use rxstatus to determine off-channel details */ if (ieee80211_parse_beacon(ni, m0, ic->ic_curchan, &scan) &~ IEEE80211_BPARSE_OFFCHAN) |
