From 80a9e7675d2f183a063e4a2a35bfdce8ffc0c372 Mon Sep 17 00:00:00 2001 From: sam Date: Sun, 19 Oct 2008 21:34:49 +0000 Subject: 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 --- sys/dev/ath/if_ath.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 812980d..4a4395c 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -2403,7 +2403,8 @@ ath_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k, * 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 */ -- cgit v1.1