diff options
| author |   kevlo <kevlo@openbsd.org> | 2019-01-29 09:35:16 +0000 |
|---|---|---|
| committer | kevlo <kevlo@openbsd.org> | 2019-01-29 09:35:16 +0000 |
| commit | afbf2756b287206d729f5890b2e56ba187cba2c9 (patch) | |
| tree | 4912918022541015edc91b7c66009ca81b6a9ca3 | |
| parent | Make -N and -r mutually exclusive (diff) | |
| download | wireguard-openbsd-afbf2756b287206d729f5890b2e56ba187cba2c9.tar.xz wireguard-openbsd-afbf2756b287206d729f5890b2e56ba187cba2c9.zip | |
Accept control frames in monitor mode.
Based on a diff from Jesper Wallin.
ok jmatthew@, stsp@
| -rw-r--r-- | sys/dev/ic/rtwn.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/dev/ic/rtwn.c b/sys/dev/ic/rtwn.c index 2eb5a08324f..fb0e23bb6d0 100644 --- a/sys/dev/ic/rtwn.c +++ b/sys/dev/ic/rtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtwn.c,v 1.43 2018/12/07 01:53:20 kevlo Exp $ */ +/* $OpenBSD: rtwn.c,v 1.44 2019/01/29 09:35:16 kevlo Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -1132,6 +1132,14 @@ rtwn_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) /* Enable Rx of data frames. */ rtwn_write_2(sc, R92C_RXFLTMAP2, 0xffff); + /* Enable Rx of control frames. */ + rtwn_write_2(sc, R92C_RXFLTMAP1, 0xffff); + + rtwn_write_4(sc, R92C_RCR, + rtwn_read_4(sc, R92C_RCR) | + R92C_RCR_AAP | R92C_RCR_ADF | R92C_RCR_ACF | + R92C_RCR_AMF); + /* Turn link LED on. */ rtwn_set_led(sc, RTWN_LED_LINK, 1); break; @@ -1905,7 +1913,6 @@ void rtwn_rxfilter_init(struct rtwn_softc *sc) { /* Initialize Rx filter. */ - /* TODO: use better filter for monitor mode. */ rtwn_write_4(sc, R92C_RCR, R92C_RCR_AAP | R92C_RCR_APM | R92C_RCR_AM | R92C_RCR_AB | R92C_RCR_APP_ICV | R92C_RCR_AMF | R92C_RCR_HTC_LOC_CTRL | |