From owner-svn-src-all@FreeBSD.ORG  Tue Feb 28 21:43:29 2012
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 D681D106567B;
	Tue, 28 Feb 2012 21:43:29 +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 C61BE8FC0A;
	Tue, 28 Feb 2012 21:43:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1SLhTe1093551;
	Tue, 28 Feb 2012 21:43:29 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1SLhTFg093549;
	Tue, 28 Feb 2012 21:43:29 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201202282143.q1SLhTFg093549@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 28 Feb 2012 21:43:29 +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: r232270 - head/sys/net80211
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: Tue, 28 Feb 2012 21:43:29 -0000

Author: adrian
Date: Tue Feb 28 21:43:29 2012
New Revision: 232270
URL: http://svn.freebsd.org/changeset/base/232270

Log:
  Only increment is_beacon_bad if we're not scanning.
  
  Otherwise things such as off-channel probe responses and beacons are also
  silently discarded and logged against this error counter.

Modified:
  head/sys/net80211/ieee80211_sta.c

Modified: head/sys/net80211/ieee80211_sta.c
==============================================================================
--- head/sys/net80211/ieee80211_sta.c	Tue Feb 28 21:41:47 2012	(r232269)
+++ head/sys/net80211/ieee80211_sta.c	Tue Feb 28 21:43:29 2012	(r232270)
@@ -1306,7 +1306,8 @@ sta_recv_mgmt(struct ieee80211_node *ni,
 		}
 		/* XXX probe response in sta mode when !scanning? */
 		if (ieee80211_parse_beacon(ni, m0, &scan) != 0) {
-			vap->iv_stats.is_beacon_bad++;
+			if (! (ic->ic_flags & IEEE80211_F_SCAN))
+				vap->iv_stats.is_beacon_bad++;
 			return;
 		}
 		/*