PERFORCE change 147251 for review

[Sam Leffler]

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

Change 147251 by sam at 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