Date: Sat, 26 Mar 2011 07:29:49 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r220025 - head/sys/dev/ath/ath_hal Message-ID: <201103260729.p2Q7Tn9Z007210@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Sat Mar 26 07:29:48 2011 New Revision: 220025 URL: http://svn.freebsd.org/changeset/base/220025 Log: 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. Modified: head/sys/dev/ath/ath_hal/ah.h Modified: head/sys/dev/ath/ath_hal/ah.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah.h Sat Mar 26 07:17:24 2011 (r220024) +++ head/sys/dev/ath/ath_hal/ah.h Sat Mar 26 07:29:48 2011 (r220025) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103260729.p2Q7Tn9Z007210>