From owner-p4-projects@FreeBSD.ORG  Wed Feb 20 18:56:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4CC6616A408; Wed, 20 Feb 2008 18:56:04 +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 113E216A401
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 18:56:04 +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 EBB7D13C44B
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 18:56:03 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1KIu3tC082719
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 18:56:03 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1KIu30n082716
	for perforce@freebsd.org; Wed, 20 Feb 2008 18:56:03 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 20 Feb 2008 18:56:03 GMT
Message-Id: <200802201856.m1KIu30n082716@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 135827 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: Wed, 20 Feb 2008 18:56:04 -0000

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

Change 135827 by sam@sam_ebb on 2008/02/20 18:56:03

	er, let's get it right this time

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#33 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#33 (text+ko) ====

@@ -689,16 +689,15 @@
 
 	if (clone && sc->sc_hasbmask) {
 		/* NB: we only do this if h/w supports multiple bssid */
-		for (i = 0; i < 32; i++)
+		for (i = 0; i < 8; i++)
 			if ((sc->sc_bssidmask & (1<<i)) == 0)
 				break;
-		if (i != 0) {
+		if (i != 0)
 			mac[0] |= (i << 2)|0x2;
-			sc->sc_hwbssidmask[0] &= ~mac[0];
-		}
 	} else
 		i = 0;
 	sc->sc_bssidmask |= 1<<i;
+	sc->sc_hwbssidmask[0] &= ~mac[0];
 	if (i == 0)
 		sc->sc_nbssid0++;
 }
@@ -707,12 +706,16 @@
 reclaim_address(struct ath_softc *sc, const uint8_t mac[IEEE80211_ADDR_LEN])
 {
 	int i = mac[0] >> 2;
+	uint8_t mask;
+
 	if (i != 0 || --sc->sc_nbssid0 == 0) {
 		sc->sc_bssidmask &= ~(1<<i);
-		sc->sc_hwbssidmask[0] |= mac[0];
-		/* put back U/L bit if any other vaps need it */
-		if (sc->sc_bssidmask & ~1)
-			sc->sc_hwbssidmask[0] &= ~0x2;
+		/* recalculate bssid mask from remaining addresses */
+		mask = 0xff;
+		for (i = 1; i < 8; i++)
+			if (sc->sc_bssidmask & (1<<i))
+				mask &= ~((i<<2)|0x2);
+		sc->sc_hwbssidmask[0] |= mask;
 	}
 }