Date: Sun, 19 Oct 2008 21:38:03 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 151573 for review Message-ID: <200810192138.m9JLc3Hk066389@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=151573 Change 151573 by sam@sam_ebb on 2008/10/19 21:37:47 change driver key alloc routines to honor a requested key index so static key wep works Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#110 edit .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#19 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#41 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#110 (text+ko) ==== @@ -2439,7 +2439,8 @@ * 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 */ ==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#19 (text+ko) ==== @@ -1883,7 +1883,8 @@ { struct mwl_softc *sc = vap->iv_ic->ic_ifp->if_softc; - if (k->wk_flags & IEEE80211_KEY_GROUP) { + if (k->wk_keyix != IEEE80211_KEYIX_NONE || + (k->wk_flags & IEEE80211_KEY_GROUP)) { if (!(&vap->iv_nw_keys[0] <= k && k < &vap->iv_nw_keys[IEEE80211_WEP_NKID])) { /* should not happen */ ==== //depot/projects/vap/sys/dev/ral/rt2661.c#41 (text) ==== @@ -935,7 +935,8 @@ struct rt2661_softc *sc = vap->iv_ic->ic_ifp->if_softc; u_int i, keyix; - if (k->wk_flags & IEEE80211_KEY_GROUP) { + if (k->wk_keyix != IEEE80211_KEYIX_NONE || + (k->wk_flags & IEEE80211_KEY_GROUP)) { if (!(&vap->iv_nw_keys[0] <= k && k < &vap->iv_nw_keys[IEEE80211_WEP_NKID])) { /* should not happen */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810192138.m9JLc3Hk066389>