From owner-p4-projects@FreeBSD.ORG  Tue Aug 12 17:25:11 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 06367106567F; Tue, 12 Aug 2008 17:25:11 +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 BDEE41065673
	for <perforce@freebsd.org>; Tue, 12 Aug 2008 17:25:10 +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 B9DE08FC35
	for <perforce@freebsd.org>; Tue, 12 Aug 2008 17:25:10 +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 m7CHPAeh057412
	for <perforce@freebsd.org>; Tue, 12 Aug 2008 17:25:10 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7CHP7KB057410
	for perforce@freebsd.org; Tue, 12 Aug 2008 17:25:07 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 12 Aug 2008 17:25:07 GMT
Message-Id: <200808121725.m7CHP7KB057410@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 147251 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 17:25:11 -0000

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

Change 147251 by sam@sam_ebb on 2008/08/12 17:24:20

	catchup with net80211 changes; untested

Affected files ...

.. //depot/projects/vap/sys/dev/mwl/if_mwl.c#13 edit

Differences ...

==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#13 (text+ko) ====

@@ -932,7 +932,7 @@
 	struct ieee80211_node *ni = sp->data[0];
 
 	/* send DELBA and drop the stream */
-	ieee80211_ampdu_stop(ni, sp->data[1]);
+	ieee80211_ampdu_stop(ni, sp->data[1], IEEE80211_REASON_UNSPECIFIED);
 }
 
 static void
@@ -3233,6 +3233,9 @@
 			mn->mn_ai.rssi_c = ds->ai.rssi_c;
 			mn->mn_ai.rsvd1 = rssi;
 #endif
+			/* tag AMPDU aggregates for reorder processing */
+			if ((ds->Rate & 0x80) && (ds->HtSig2 & 0x8))
+				m->m_flags |= M_AMPDU;
 			(void) ieee80211_input(ni, m, rssi, nf, 0/*XXX*/);
 			ieee80211_free_node(ni);
 		} else