From owner-svn-src-user@FreeBSD.ORG  Thu Sep 22 03:03:40 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8B087106566C;
	Thu, 22 Sep 2011 03:03:40 +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 7BB2C8FC08;
	Thu, 22 Sep 2011 03:03:40 +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 p8M33efA002810;
	Thu, 22 Sep 2011 03:03:40 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8M33eei002808;
	Thu, 22 Sep 2011 03:03:40 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109220303.p8M33eei002808@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 22 Sep 2011 03:03:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225723 - user/adrian/if_ath_tx/sys/net80211
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Sep 2011 03:03:40 -0000

Author: adrian
Date: Thu Sep 22 03:03:40 2011
New Revision: 225723
URL: http://svn.freebsd.org/changeset/base/225723

Log:
  Remove an unneeded check; tidy it up a bit, add comments about
  where things may still go pear-shaped.

Modified:
  user/adrian/if_ath_tx/sys/net80211/ieee80211_sta.c

Modified: user/adrian/if_ath_tx/sys/net80211/ieee80211_sta.c
==============================================================================
--- user/adrian/if_ath_tx/sys/net80211/ieee80211_sta.c	Thu Sep 22 02:07:29 2011	(r225722)
+++ user/adrian/if_ath_tx/sys/net80211/ieee80211_sta.c	Thu Sep 22 03:03:40 2011	(r225723)
@@ -592,10 +592,15 @@ sta_input(struct ieee80211_node *ni, str
 		 *
 		 * If we receive a data frame that isn't
 		 * destined to our VAP MAC, drop it.
+		 *
+		 * XXX TODO: This is only enforced when not scanning;
+		 * XXX it assumes a software-driven scan will put the NIC
+		 * XXX into a "no data frames" mode before setting this
+		 * XXX flag. Otherwise it may be possible that we'll still
+		 * XXX process data frames whilst scanning.
 		 */
-		if (ni == vap->iv_bss
-		    && (!(IEEE80211_IS_MULTICAST(wh->i_addr1)))
-		    && (!IEEE80211_ADDR_EQ(wh->i_addr1, IF_LLADDR(ifp)))) {
+		if ((! IEEE80211_IS_MULTICAST(wh->i_addr1))
+		    && (! IEEE80211_ADDR_EQ(wh->i_addr1, IF_LLADDR(ifp)))) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 			    bssid, NULL, "not to cur sta: lladdr=%6D, addr1=%6D",
 			    IF_LLADDR(ifp), ":", wh->i_addr1, ":");