d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

urtwn: fix non-ERP BSS detection in HOSTAP mode.

Browse Source 
Receive all beacons in HOSTAP mode; they will give more information about
present non-ERP / legacy BSSs (used to choose protection mode).

Tested with RTL8188CUS (HOSTAP, urtwn) + RTL8821AU (HOSTAP, 11b mode).
This commit is contained in:
Andriy Voskoboinyk 2016-06-01 14:57:53 +00:00
parent 6bf4498cbc
commit 55eb77a20a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=301128
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/urtwn/if_urtwn.c
View File

@ -2627,10 +2627,11 @@ urtwn_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
if (ic->ic_promisc == 0) { if (ic->ic_promisc == 0) {
reg = urtwn_read_4(sc, R92C_RCR); reg = urtwn_read_4(sc, R92C_RCR);
if (vap->iv_opmode != IEEE80211_M_HOSTAP) if (vap->iv_opmode != IEEE80211_M_HOSTAP) {
reg |= R92C_RCR_CBSSID_DATA; reg |= R92C_RCR_CBSSID_DATA;
if (vap->iv_opmode != IEEE80211_M_IBSS) if (vap->iv_opmode != IEEE80211_M_IBSS)
reg |= R92C_RCR_CBSSID_BCN; reg |= R92C_RCR_CBSSID_BCN;
}
urtwn_write_4(sc, R92C_RCR, reg); urtwn_write_4(sc, R92C_RCR, reg);
} }
@ -4723,7 +4724,8 @@ urtwn_scan_start(struct ieee80211com *ic)
URTWN_LOCK(sc); URTWN_LOCK(sc);
/* Receive beacons / probe responses from any BSSID. */ /* Receive beacons / probe responses from any BSSID. */
if (ic->ic_opmode != IEEE80211_M_IBSS) if (ic->ic_opmode != IEEE80211_M_IBSS &&
ic->ic_opmode != IEEE80211_M_HOSTAP)
urtwn_set_rx_bssid_all(sc, 1); urtwn_set_rx_bssid_all(sc, 1);
/* Set gain for scanning. */ /* Set gain for scanning. */
@ -4738,7 +4740,9 @@ urtwn_scan_end(struct ieee80211com *ic)
URTWN_LOCK(sc); URTWN_LOCK(sc);
/* Restore limitations. */ /* Restore limitations. */
if (ic->ic_promisc == 0 && ic->ic_opmode != IEEE80211_M_IBSS) if (ic->ic_promisc == 0 &&
ic->ic_opmode != IEEE80211_M_IBSS &&
ic->ic_opmode != IEEE80211_M_HOSTAP)
urtwn_set_rx_bssid_all(sc, 0); urtwn_set_rx_bssid_all(sc, 0);
/* Set gain under link. */ /* Set gain under link. */
@ -4931,14 +4935,13 @@ urtwn_set_promisc(struct urtwn_softc *sc)
if (vap->iv_state == IEEE80211_S_RUN) { if (vap->iv_state == IEEE80211_S_RUN) {
switch (vap->iv_opmode) { switch (vap->iv_opmode) {
case IEEE80211_M_STA: case IEEE80211_M_STA:
mask2 |= R92C_RCR_CBSSID_DATA;
/* FALLTHROUGH */
case IEEE80211_M_HOSTAP:
mask2 |= R92C_RCR_CBSSID_BCN; mask2 |= R92C_RCR_CBSSID_BCN;
break; /* FALLTHROUGH */
case IEEE80211_M_IBSS: case IEEE80211_M_IBSS:
mask2 |= R92C_RCR_CBSSID_DATA; mask2 |= R92C_RCR_CBSSID_DATA;
break; break;
case IEEE80211_M_HOSTAP:
break;
default: default:
device_printf(sc->sc_dev, "%s: undefined opmode %d\n", device_printf(sc->sc_dev, "%s: undefined opmode %d\n",
__func__, vap->iv_opmode); __func__, vap->iv_opmode);