PERFORCE change 141226 for review

[Sam Leffler]

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

Change 141226 by sam at sam_ebb on 2008/05/06 04:00:11

	Bring in old fix; when forming ADDBA request use the starting
	seq# from the state block so a BA stream starts off with the
	expected seq#.  We carefully do this after calling back into
	the driver so it has a chance to fillin this value as it may
	have to come out of the device (in case it's handling BA's).

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ht.c#22 edit

Differences ...

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

@@ -1651,9 +1651,6 @@
 		| SM(IEEE80211_AGGR_BAWMAX, IEEE80211_BAPS_BUFSIZ)
 		;
 	args[2] = 0;	/* batimeout */
-	args[3] = SM(0, IEEE80211_BASEQ_START)
-		| SM(0, IEEE80211_BASEQ_FRAG)
-		;
 	/* NB: do first so there's no race against reply */
 	if (!ic->ic_addba_request(ni, tap, dialogtoken, args[1], args[2])) {
 		/* unable to setup state, don't make request */
@@ -1668,6 +1665,10 @@
 		return 0;
 	}
 	tokens = dialogtoken;			/* allocate token */
+	/* NB: after calling ic_addba_request so driver can set seqstart */
+	args[3] = SM(tap->txa_seqstart, IEEE80211_BASEQ_START)
+		| SM(0, IEEE80211_BASEQ_FRAG)
+		;
 	return ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA,
 		IEEE80211_ACTION_BA_ADDBA_REQUEST, args);
 }