Date: Wed, 20 Apr 2016 18:48:39 +0000 (UTC) From: Andriy Voskoboinyk <avos@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298360 - head/sys/net80211 Message-ID: <201604201848.u3KImdHY043809@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avos Date: Wed Apr 20 18:48:39 2016 New Revision: 298360 URL: https://svnweb.freebsd.org/changeset/base/298360 Log: net80211 (trivial, noop): remove duplicate check from hostap_recv_mgmt() Differential Revision: https://reviews.freebsd.org/D5483 Modified: head/sys/net80211/ieee80211_hostap.c Modified: head/sys/net80211/ieee80211_hostap.c ============================================================================== --- head/sys/net80211/ieee80211_hostap.c Wed Apr 20 18:29:30 2016 (r298359) +++ head/sys/net80211/ieee80211_hostap.c Wed Apr 20 18:48:39 2016 (r298360) @@ -1677,18 +1677,19 @@ hostap_recv_mgmt(struct ieee80211_node * 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604201848.u3KImdHY043809>