From owner-svn-src-all@FreeBSD.ORG  Sat Mar 26 07:29:49 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3EF0F1065670;
	Sat, 26 Mar 2011 07:29:49 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2FEE88FC0A;
	Sat, 26 Mar 2011 07:29:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2Q7TnDD007212;
	Sat, 26 Mar 2011 07:29:49 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2Q7Tn9Z007210;
	Sat, 26 Mar 2011 07:29:49 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201103260729.p2Q7Tn9Z007210@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 26 Mar 2011 07:29:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220025 - head/sys/dev/ath/ath_hal
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Mar 2011 07:29:49 -0000

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;