From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 10 10:59:25 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 8182610656AC;
	Wed, 10 Jun 2009 10:59:25 +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 6F7338FC14;
	Wed, 10 Jun 2009 10:59:25 +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 n5AAxPfL010909;
	Wed, 10 Jun 2009 10:59:25 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AAxPJ2010908;
	Wed, 10 Jun 2009 10:59:25 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906101059.n5AAxPJ2010908@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 10 Jun 2009 10:59:25 +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: r193899 - 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: Wed, 10 Jun 2009 10:59:26 -0000

Author: rpaulo
Date: Wed Jun 10 10:59:25 2009
New Revision: 193899
URL: http://svn.freebsd.org/changeset/base/193899

Log:
  Set the AID field correctly.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Wed Jun 10 10:53:14 2009	(r193898)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Wed Jun 10 10:59:25 2009	(r193899)
@@ -721,7 +721,7 @@ ieee80211_send_action(struct ieee80211_n
 		 *   [1] category
 		 *   [2] capabilities
 		 *   [2] status code
-		 *   [2] association id (0)
+		 *   [2] association id (peer ID)
 		 *   [tlv] rates
 		 *   [tlv] xrates
 		 *   [tlv] mesh id
@@ -735,8 +735,8 @@ ieee80211_send_action(struct ieee80211_n
 			    "peerid 0x%x", vargs.fixedarg[0],
 			    vargs.fixedarg[1]);
 			ADDSHORT(frm, getcapinfo(vap, ni->ni_chan));
-			ADDSHORT(frm, 0);	/* status code */
-			ADDSHORT(frm, 0);	/* AID */
+			ADDSHORT(frm, 0);		  /* status code */
+			ADDSHORT(frm, vargs.fixedarg[1]); /* AID */
 			frm = ieee80211_add_rates(frm, rs);
 			frm = ieee80211_add_xrates(frm, rs);
 			frm = ieee80211_add_meshid(frm, vap);