summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2011-03-26 07:29:48 +0000
committeradrian <adrian@FreeBSD.org>2011-03-26 07:29:48 +0000
commitf67f722dc849cffc73140a116f9d3f5ef7c3e22f (patch)
tree7abc98179f92c874e0d3d4a44c35679fc3a51d0a
parent0d6974a72124b781ee06810058cc18e1fdc54767 (diff)
downloadFreeBSD-src-f67f722dc849cffc73140a116f9d3f5ef7c3e22f.zip
FreeBSD-src-f67f722dc849cffc73140a116f9d3f5ef7c3e22f.tar.gz
Put these two back to mirror what ath9k does.
Even though they map to setting the error filter register, ath9k also writes them untouched to AR_RX_FILTER. The Force-BSSID match bit can stay high, as it maps to a misc mode register setting rather than an RX filter bit.
-rw-r--r--sys/dev/ath/ath_hal/ah.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ath/ath_hal/ah.h b/sys/dev/ath/ath_hal/ah.h
index 377e25f..d379099 100644
--- a/sys/dev/ath/ath_hal/ah.h
+++ b/sys/dev/ath/ath_hal/ah.h
@@ -301,8 +301,10 @@ typedef enum {
HAL_RX_FILTER_BEACON = 0x00000010, /* Allow beacon frames */
HAL_RX_FILTER_PROM = 0x00000020, /* Promiscuous mode */
HAL_RX_FILTER_PROBEREQ = 0x00000080, /* Allow probe request frames */
+ HAL_RX_FILTER_PHYERR = 0x00000100, /* Allow phy errors */
HAL_RX_FILTER_COMPBAR = 0x00000400, /* Allow compressed BAR */
HAL_RX_FILTER_COMP_BA = 0x00000800, /* Allow compressed blockack */
+ HAL_RX_FILTER_PHYRADAR = 0x00002000, /* Allow phy radar errors */
HAL_RX_FILTER_PSPOLL = 0x00004000, /* Allow PS-POLL frames */
HAL_RX_FILTER_MCAST_BCAST_ALL = 0x00008000,
/* Allow all mcast/bcast frames */
@@ -312,8 +314,6 @@ typedef enum {
* but instead the HAL sets individual bits - eg PHYERR will result
* in OFDM/CCK timing error frames being received.
*/
- HAL_RX_FILTER_PHYERR = 0x10000000, /* Allow phy errors */
- HAL_RX_FILTER_PHYRADAR = 0x20000000, /* Allow phy radar errors */
HAL_RX_FILTER_BSSID = 0x40000000, /* Disable BSSID match */
} HAL_RX_FILTER;
OpenPOWER on IntegriCloud