PERFORCE change 149639 for review

[Sam Leffler]

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

Change 149639 by sam at sam_ebb on 2008/09/12 04:35:39

	o track txa_seqstart->txa_start change
	o fix hvap local sta db delete for station mode (use the correct mac)

Affected files ...

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

Differences ...

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

@@ -2682,8 +2682,12 @@
 	if (mn->mn_staid != 0) {
 		struct ieee80211vap *vap = ni->ni_vap;
 
-		if (mn->mn_hvap != NULL)
-			mwl_hal_delstation(mn->mn_hvap, ni->ni_macaddr);
+		if (mn->mn_hvap != NULL) {
+			if (vap->iv_opmode == IEEE80211_M_STA)
+				mwl_hal_delstation(mn->mn_hvap, vap->iv_myaddr);
+			else
+				mwl_hal_delstation(mn->mn_hvap, ni->ni_macaddr);
+		}
 		/*
 		 * NB: legacy WDS peer sta db entry is installed using
 		 * the associate ap's hvap; use it again to delete it.
@@ -4085,9 +4089,10 @@
 		bas->bastream = sp;
 		tap->txa_private = bas;
 	}
+	/* fetch current seq# from the firmware; if available */
 	if (mwl_hal_bastream_get_seqno(sc->sc_mh, bas->bastream,
-	    &tap->txa_seqstart) != 0)
-		tap->txa_seqstart = 0;
+	    &tap->txa_start) != 0)
+		tap->txa_start = 0;
 	return sc->sc_addba_request(ni, tap, dialogtoken, baparamset, batimeout);
 }
 
@@ -4118,8 +4123,8 @@
 		bufsiz = MS(baparamset, IEEE80211_BAPS_BUFSIZ);
 		if (bufsiz == 0)
 			bufsiz = IEEE80211_AGGR_BAWMAX;
-		error = mwl_hal_bastream_create(sc->sc_mh,  bas->bastream,
-		    bufsiz, bufsiz-1, tap->txa_seqstart);
+		error = mwl_hal_bastream_create(sc->sc_mh, bas->bastream,
+		    bufsiz, bufsiz-1, tap->txa_start);
 		if (error != 0) {
 			/*
 			 * Setup failed, return immediately so no a-mpdu