From owner-svn-src-head@freebsd.org  Mon Oct 12 08:17:22 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B3A37A11AD5;
 Mon, 12 Oct 2015 08:17:22 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7B1A217E1;
 Mon, 12 Oct 2015 08:17:22 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9C8HLGq001794;
 Mon, 12 Oct 2015 08:17:21 GMT (envelope-from kevlo@FreeBSD.org)
Received: (from kevlo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9C8HLAF001793;
 Mon, 12 Oct 2015 08:17:21 GMT (envelope-from kevlo@FreeBSD.org)
Message-Id: <201510120817.t9C8HLAF001793@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevlo set sender to
 kevlo@FreeBSD.org using -f
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Mon, 12 Oct 2015 08:17:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r289173 - head/sys/dev/usb/wlan
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2015 08:17:22 -0000

Author: kevlo
Date: Mon Oct 12 08:17:21 2015
New Revision: 289173
URL: https://svnweb.freebsd.org/changeset/base/289173

Log:
  Accept any correct frames from any source when MONITOR mode is used.
  
  Submitted by:	Andriy Voskoboinyk <s3erios at gmail.com>
  Differential Revision:	https://reviews.freebsd.org/D3812

Modified:
  head/sys/dev/usb/wlan/if_urtwn.c

Modified: head/sys/dev/usb/wlan/if_urtwn.c
==============================================================================
--- head/sys/dev/usb/wlan/if_urtwn.c	Mon Oct 12 08:16:03 2015	(r289172)
+++ head/sys/dev/usb/wlan/if_urtwn.c	Mon Oct 12 08:17:21 2015	(r289173)
@@ -1632,6 +1632,19 @@ urtwn_newstate(struct ieee80211vap *vap,
 			/* Enable Rx of data frames. */
 			urtwn_write_2(sc, R92C_RXFLTMAP2, 0xffff);
 
+			/* Enable Rx of ctrl frames. */
+			urtwn_write_2(sc, R92C_RXFLTMAP1, 0xffff);
+
+			/*
+			 * Accept data/control/management frames
+			 * from any BSSID.
+			 */
+			urtwn_write_4(sc, R92C_RCR,
+			    (urtwn_read_4(sc, R92C_RCR) & ~(R92C_RCR_APM |
+			    R92C_RCR_CBSSID_DATA | R92C_RCR_CBSSID_BCN)) |
+			    R92C_RCR_ADF | R92C_RCR_ACF | R92C_RCR_AMF |
+			    R92C_RCR_AAP);
+
 			/* Turn link LED on. */
 			urtwn_set_led(sc, URTWN_LED_LINK, 1);
 			break;