From owner-p4-projects@FreeBSD.ORG  Fri Mar  7 23:05:25 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E75E41065670; Fri,  7 Mar 2008 23:05:24 +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 A735E1065671
	for <perforce@freebsd.org>; Fri,  7 Mar 2008 23:05:24 +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 963E28FC16
	for <perforce@freebsd.org>; Fri,  7 Mar 2008 23:05:24 +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 m27N5OOt005152
	for <perforce@freebsd.org>; Fri, 7 Mar 2008 23:05:24 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m27N5OGn005150
	for perforce@freebsd.org; Fri, 7 Mar 2008 23:05:24 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 7 Mar 2008 23:05:24 GMT
Message-Id: <200803072305.m27N5OGn005150@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 137129 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, 07 Mar 2008 23:05:25 -0000

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

Change 137129 by sam@sam_ebb on 2008/03/07 23:04:40

	call ath_newassoc explicitly for sta mode operation so we setup
	driver private rate state

Affected files ...

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

Differences ...

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

@@ -5601,12 +5601,9 @@
 			break;
 		case IEEE80211_M_STA:
 			/*
-			 * Allocate a key cache slot to the station.
+			 * Fakeup since we're not called by net80211.
 			 */
-			if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0 &&
-			    sc->sc_hasclrkey &&
-			    ni->ni_ucastkey.wk_keyix == IEEE80211_KEYIX_NONE)
-				ath_setup_stationkey(ni);
+			ath_newassoc(ni, 1);
 			/*
 			 * Defer beacon timer configuration to the next
 			 * beacon frame so we have a current TSF to use
@@ -5731,13 +5728,10 @@
 	an->an_mgmtrix = ath_tx_findrix(sc->sc_rates[mode], tp->mgmtrate);
 
 	ath_rate_newassoc(sc, an, isnew);
-	if (isnew &&
-	    (vap->iv_flags & IEEE80211_F_PRIVACY) == 0 && sc->sc_hasclrkey) {
-		KASSERT(ni->ni_ucastkey.wk_keyix == IEEE80211_KEYIX_NONE,
-		    ("new assoc with a unicast key already setup (keyix %u)",
-		    ni->ni_ucastkey.wk_keyix));
+	if (isnew && 
+	    (vap->iv_flags & IEEE80211_F_PRIVACY) == 0 && sc->sc_hasclrkey &&
+	    ni->ni_ucastkey.wk_keyix == IEEE80211_KEYIX_NONE)
 		ath_setup_stationkey(ni);
-	}
 }
 
 static int