d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net80211 + drivers: convert to ieee80211_crypto_get_key_wepidx().

Browse Source 
Proposed by:	adrian
This commit is contained in:
Andriy Voskoboinyk 2016-12-07 22:16:07 +00:00
parent b594081bdf
commit 4a19d71238
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/ath/if_ath_keycache.c
View File

@ -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;
}
/*

2
sys/dev/mwl/if_mwl.c
View File

@ -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.

4
sys/dev/rtwn/if_rtwn_cam.c
View File

@ -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 {

2
sys/dev/usb/wlan/if_rsu.c
View File

@ -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;

2
sys/dev/usb/wlan/if_rum.c
View File

@ -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;

2
sys/net80211/ieee80211_crypto.c
View File

@ -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;