net80211 + drivers: convert to ieee80211_crypto_get_key_wepidx().

Proposed by:	adrian

diff --git a/sys/dev/ath/if_ath_keycache.c b/sys/dev/ath/if_ath_keycache.c
index ff1df8463e01609088eef0c6a7527456b0d554b6..308a7f6c98479bd2a4bd7fa8ea8f9c48bcd5a30b 100644 (file)
--- a/sys/dev/ath/if_ath_keycache.c
+++ b/sys/dev/ath/if_ath_keycache.c
@@ -449,7 +449,8 @@ ath_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k,
                         * have no way to check if they've already
                         * been allocated.
                         */
-                       *keyix = *rxkeyix = k - vap->iv_nw_keys;
+                       *keyix = *rxkeyix =
+                           ieee80211_crypto_get_key_wepidx(vap, k);
                        return 1;
                }
                /*

diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c
index f9307341a63cf4cf25064bfc82c44ef191f95028..1027eb0524db40301d35c53413b68221ad519c09 100644 (file)
--- a/sys/dev/mwl/if_mwl.c
+++ b/sys/dev/mwl/if_mwl.c
@@ -1529,7 +1529,7 @@ mwl_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k,
                        return 0;
                }
                /* give the caller what they requested */
-               *keyix = *rxkeyix = k - vap->iv_nw_keys;
+               *keyix = *rxkeyix = ieee80211_crypto_get_key_wepidx(vap, k);
        } else {
                /*
                 * Firmware handles key allocation.

diff --git a/sys/dev/rtwn/if_rtwn_cam.c b/sys/dev/rtwn/if_rtwn_cam.c
index c817a6ea9435c1b104f5ea1ab51b7ca19dab76f0..539fb411f770bb0b56db02ce5a50796c3ea01239 100644 (file)
--- a/sys/dev/rtwn/if_rtwn_cam.c
+++ b/sys/dev/rtwn/if_rtwn_cam.c
@@ -118,7 +118,11 @@ rtwn_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k,
 
        if (&vap->iv_nw_keys[0] <= k &&
            k < &vap->iv_nw_keys[IEEE80211_WEP_NKID]) {
+#if __FreeBSD_version > 1200018
+               *keyix = ieee80211_crypto_get_key_wepidx(vap, k);
+#else
                *keyix = k - vap->iv_nw_keys;
+#endif
                if (sc->sc_hwcrypto != RTWN_CRYPTO_FULL)
                        k->wk_flags |= IEEE80211_KEY_SWCRYPT;
                else {

diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c
index 33cd69dcd61e900968f0eba225ef9a85711ddff6..b239147cbc1ff61654d09f3f9a2f91dfd62ca809 100644 (file)
--- a/sys/dev/usb/wlan/if_rsu.c
+++ b/sys/dev/usb/wlan/if_rsu.c
@@ -1428,7 +1428,7 @@ rsu_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k,
 
        if (&vap->iv_nw_keys[0] <= k &&
            k < &vap->iv_nw_keys[IEEE80211_WEP_NKID]) {
-               *keyix = k - vap->iv_nw_keys;
+               *keyix = ieee80211_crypto_get_key_wepidx(vap, k);
        } else {
                if (vap->iv_opmode != IEEE80211_M_STA) {
                        *keyix = 0;

diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c
index 17c6f01d57e0fbe0c4da1f8cb5c0d76a80cdc2cc..0f88c178cf9d42d1c01edf219541ed39e5e6c0bb 100644 (file)
--- a/sys/dev/usb/wlan/if_rum.c
+++ b/sys/dev/usb/wlan/if_rum.c
@@ -3046,7 +3046,7 @@ rum_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k,
                } else
                        *keyix = 0;
        } else {
-               *keyix = k - vap->iv_nw_keys;
+               *keyix = ieee80211_crypto_get_key_wepidx(vap, k);
        }
        *rxkeyix = *keyix;
        return 1;

diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c
index 546fc2b41bd5936382908b8811aa377b212aa4df..a5f97642bc547cb4bcc630aceff2f47aa39336c7 100644 (file)
--- a/sys/net80211/ieee80211_crypto.c
+++ b/sys/net80211/ieee80211_crypto.c
@@ -78,7 +78,7 @@ null_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k,
                        return 0;
                *keyix = 0;     /* NB: use key index 0 for ucast key */
        } else {
-               *keyix = k - vap->iv_nw_keys;
+               *keyix = ieee80211_crypto_get_key_wepidx(vap, k);
        }
        *rxkeyix = IEEE80211_KEYIX_NONE;        /* XXX maybe *keyix? */
        return 1;