From owner-svn-src-projects@FreeBSD.ORG  Wed Jan 28 21:34:08 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 0BB56106566C;
	Wed, 28 Jan 2009 21:34:08 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EF0A38FC38;
	Wed, 28 Jan 2009 21:34:07 +0000 (UTC) (envelope-from sam@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 n0SLY7WY034034;
	Wed, 28 Jan 2009 21:34:07 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0SLY7Fj034033;
	Wed, 28 Jan 2009 21:34:07 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200901282134.n0SLY7Fj034033@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Wed, 28 Jan 2009 21:34:07 +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: r187870 - projects/vap7/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: Wed, 28 Jan 2009 21:34:08 -0000

Author: sam
Date: Wed Jan 28 21:34:07 2009
New Revision: 187870
URL: http://svn.freebsd.org/changeset/base/187870

Log:
  hand merge r179640; must've been botched in a previous attempt

Modified:
  projects/vap7/sys/net80211/ieee80211_node.c

Modified: projects/vap7/sys/net80211/ieee80211_node.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_node.c	Wed Jan 28 21:23:40 2009	(r187869)
+++ projects/vap7/sys/net80211/ieee80211_node.c	Wed Jan 28 21:34:07 2009	(r187870)
@@ -2282,8 +2282,7 @@ ieee80211_node_join(struct ieee80211_nod
 				break;
 		}
 		if (aid >= vap->iv_max_aid) {
-			IEEE80211_SEND_MGMT(ni, resp,
-			    IEEE80211_REASON_ASSOC_TOOMANY);
+			IEEE80211_SEND_MGMT(ni, resp, IEEE80211_STATUS_TOOMANY);
 			ieee80211_node_leave(ni);
 			return;
 		}