svn commit: r193899 - projects/mesh11s/sys/net80211

[Rui Paulo]

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);