From owner-svn-src-projects@FreeBSD.ORG  Sun Jun 28 17:15:17 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B7E1E106566C;
	Sun, 28 Jun 2009 17:15:17 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A69918FC18;
	Sun, 28 Jun 2009 17:15:17 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5SHFHeI017278;
	Sun, 28 Jun 2009 17:15:17 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5SHFHOX017276;
	Sun, 28 Jun 2009 17:15:17 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906281715.n5SHFHOX017276@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sun, 28 Jun 2009 17:15:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195143 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Jun 2009 17:15:18 -0000

Author: rpaulo
Date: Sun Jun 28 17:15:17 2009
New Revision: 195143
URL: http://svn.freebsd.org/changeset/base/195143

Log:
  Move the ACL check to a better place.
  
  Pointed out by:	sam
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sun Jun 28 17:04:37 2009	(r195142)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sun Jun 28 17:15:17 2009	(r195143)
@@ -439,17 +439,6 @@ mesh_input(struct ieee80211_node *ni, st
 		vap->iv_stats.is_rx_badversion++;
 		goto err;
 	}
-
-	/*
-	 * Consult the ACL policy module if setup.
-	 */
-	if (vap->iv_acl != NULL && !vap->iv_acl->iac_check(vap, wh->i_addr2)) {
-		IEEE80211_DISCARD(vap, IEEE80211_MSG_ACL,
-		    wh, NULL, "%s", "disallowed by ACL");
-		vap->iv_stats.is_rx_acl++;
-		goto out;
-	}
-
 	dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 	subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
@@ -692,6 +681,16 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 		if (vap->iv_state != IEEE80211_S_RUN)
 			return;
 		/*
+		 * Peer only based on the current ACL policy.
+		 */
+		if (vap->iv_acl != NULL &&
+		    !vap->iv_acl->iac_check(vap, wh->i_addr2)) {
+			IEEE80211_DISCARD(vap, IEEE80211_MSG_ACL,
+			    wh, NULL, "%s", "disallowed by ACL");
+			vap->iv_stats.is_rx_acl++;
+			return;
+		}
+		/*
 		 * Ignore non-mesh STAs.
 		 */
 		if ((scan.capinfo &