From owner-p4-projects@FreeBSD.ORG  Tue Aug 12 16:09:48 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9249C106566C; Tue, 12 Aug 2008 16:09:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 572421065681
	for <perforce@freebsd.org>; Tue, 12 Aug 2008 16:09:48 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 538AB8FC29
	for <perforce@freebsd.org>; Tue, 12 Aug 2008 16:09:48 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7CG9mF5040725
	for <perforce@freebsd.org>; Tue, 12 Aug 2008 16:09:48 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7CG9m0O040723
	for perforce@freebsd.org; Tue, 12 Aug 2008 16:09:48 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 12 Aug 2008 16:09:48 GMT
Message-Id: <200808121609.m7CG9m0O040723@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 147239 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Aug 2008 16:09:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=147239

Change 147239 by sam@sam_ebb on 2008/08/12 16:09:22

	pass a reason code to ieee80211_ampdu_stop to use in forming delba

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ht.c#29 edit
.. //depot/projects/vap/sys/net80211/ieee80211_ht.h#16 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#29 (text+ko) ====

@@ -1691,7 +1691,8 @@
  * and the peer notified with a DelBA Action frame.
  */
 void
-ieee80211_ampdu_stop(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap)
+ieee80211_ampdu_stop(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap,
+	int reason)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211vap *vap = ni->ni_vap;
@@ -1700,13 +1701,14 @@
 	/* XXX locking */
 	if (IEEE80211_AMPDU_RUNNING(tap)) {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N,
-		    ni, "%s: stop BA stream for AC %d", __func__, tap->txa_ac);
+		    ni, "%s: stop BA stream for AC %d (reason %d)",
+		    __func__, tap->txa_ac, reason);
 		vap->iv_stats.is_ampdu_stop++;
 
 		ic->ic_addba_stop(ni, tap);
 		args[0] = WME_AC_TO_TID(tap->txa_ac);
 		args[1] = IEEE80211_DELBAPS_INIT;
-		args[2] = 1;				/* XXX reason code */
+		args[2] = reason;			/* XXX reason code */
 		ieee80211_send_action(ni, IEEE80211_ACTION_CAT_BA,
 			IEEE80211_ACTION_BA_DELBA, args);
 	} else {

==== //depot/projects/vap/sys/net80211/ieee80211_ht.h#16 (text+ko) ====

@@ -183,7 +183,7 @@
 int	ieee80211_ampdu_request(struct ieee80211_node *,
 		struct ieee80211_tx_ampdu *);
 void	ieee80211_ampdu_stop(struct ieee80211_node *,
-		struct ieee80211_tx_ampdu *);
+		struct ieee80211_tx_ampdu *, int);
 int	ieee80211_send_bar(struct ieee80211_node *,
 		const struct ieee80211_tx_ampdu *);
 int	ieee80211_send_action(struct ieee80211_node *,