From owner-svn-src-all@FreeBSD.ORG  Sun Oct 19 21:34:49 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7E705106567D;
	Sun, 19 Oct 2008 21:34:49 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6D45E8FC24;
	Sun, 19 Oct 2008 21:34:49 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9JLYnqO052990;
	Sun, 19 Oct 2008 21:34:49 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9JLYnxd052988;
	Sun, 19 Oct 2008 21:34:49 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200810192134.m9JLYnxd052988@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sun, 19 Oct 2008 21:34:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184063 - head/sys/dev/ath
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Oct 2008 21:34:49 -0000

Author: sam
Date: Sun Oct 19 21:34:49 2008
New Revision: 184063
URL: http://svn.freebsd.org/changeset/base/184063

Log:
  fix static key wep; r183248 caused drivers to be called for keys to be
  assigned to slots in the global key table but ath_key_alloc was not
  updated to handle that

Modified:
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Sun Oct 19 20:14:48 2008	(r184062)
+++ head/sys/dev/ath/if_ath.c	Sun Oct 19 21:34:49 2008	(r184063)
@@ -2403,7 +2403,8 @@ ath_key_alloc(struct ieee80211vap *vap, 
 	 * it permits us to support multiple users for adhoc and/or
 	 * multi-station operation.
 	 */
-	if ((k->wk_flags & IEEE80211_KEY_GROUP) && !sc->sc_mcastkey) {
+	if (k->wk_keyix != IEEE80211_KEYIX_NONE ||	/* global key */
+	    ((k->wk_flags & IEEE80211_KEY_GROUP) && !sc->sc_mcastkey)) {
 		if (!(&vap->iv_nw_keys[0] <= k &&
 		      k < &vap->iv_nw_keys[IEEE80211_WEP_NKID])) {
 			/* should not happen */