From owner-p4-projects@FreeBSD.ORG  Fri Sep 12 04:36:28 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1E8A81065674; Fri, 12 Sep 2008 04:36:28 +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 D6BAB1065672
	for <perforce@freebsd.org>; Fri, 12 Sep 2008 04:36:27 +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 C4F258FC0C
	for <perforce@freebsd.org>; Fri, 12 Sep 2008 04:36:27 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8C4aRL7079919
	for <perforce@freebsd.org>; Fri, 12 Sep 2008 04:36:27 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8C4aRLH079917
	for perforce@freebsd.org; Fri, 12 Sep 2008 04:36:27 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 12 Sep 2008 04:36:27 GMT
Message-Id: <200809120436.m8C4aRLH079917@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 149639 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: Fri, 12 Sep 2008 04:36:28 -0000

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

Change 149639 by sam@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