From owner-p4-projects@FreeBSD.ORG  Mon Mar 17 16:52:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B7F41065672; Mon, 17 Mar 2008 16:52:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 09AED1065671
	for <perforce@freebsd.org>; Mon, 17 Mar 2008 16:52:04 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EE5F48FC14
	for <perforce@freebsd.org>; Mon, 17 Mar 2008 16:52:03 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2HGq3bW019138
	for <perforce@freebsd.org>; Mon, 17 Mar 2008 16:52:03 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2HGq3xa019136
	for perforce@freebsd.org; Mon, 17 Mar 2008 16:52:03 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 17 Mar 2008 16:52:03 GMT
Message-Id: <200803171652.m2HGq3xa019136@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 137925 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Mar 2008 16:52:04 -0000

http://perforce.freebsd.org/chv.cgi?CH=137925

Change 137925 by sam@sam_ebb on 2008/03/17 16:51:16

	enable beacon rx when on 11g channels so we can detect overlapping bss 

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#46 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#46 (text+ko) ====

@@ -2463,9 +2463,12 @@
  *     node table entries for peers,
  *   - when scanning
  *   - when doing s/w beacon miss (e.g. for ap+sta)
+ *   - when operatin in ap mode in 11g to detect overlapping bss that
+ *     require protection
  * o accept control frames:
  *   - when in monitor mode
  * XXX BAR frames for 11n
+ * XXX HT protection for 11n
  */
 static u_int32_t
 ath_calcrxfilter(struct ath_softc *sc)
@@ -2493,6 +2496,14 @@
 	    sc->sc_opmode == HAL_M_IBSS ||
 	    sc->sc_swbmiss || sc->sc_scanning)
 		rfilt |= HAL_RX_FILTER_BEACON;
+	/*
+	 * NB: We don't recalculate the rx filter when
+	 * ic_protmode changes; otherwise we could do
+	 * this only when ic_protmode != NONE.
+	 */
+	if (ic->ic_opmode == IEEE80211_M_HOSTAP &&
+	    IEEE80211_IS_CHAN_ANYG(ic->ic_curchan))
+		rfilt |= HAL_RX_FILTER_BEACON;
 	if (ic->ic_opmode == IEEE80211_M_MONITOR)
 		rfilt |= HAL_RX_FILTER_CONTROL;
 	return rfilt;