svn commit: r184063 - head/sys/dev/ath

[Sam Leffler]

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 */