MFC 1.45: honor user-specified key index for global key slots

Approved by:	re (scottl)
This commit is contained in:
sam 2006-02-28 02:02:43 +00:00
parent 4a59009fe0
commit 287e53e251

View File

@ -1588,6 +1588,12 @@ ieee80211_ioctl_setkey(struct ieee80211com *ic, struct ieee80211req *ireq)
if (kid >= IEEE80211_WEP_NKID)
return EINVAL;
wk = &ic->ic_nw_keys[kid];
/*
* Global slots start off w/o any assigned key index.
* Force one here for consistency with IEEE80211_IOC_WEPKEY.
*/
if (wk->wk_keyix == IEEE80211_KEYIX_NONE)
wk->wk_keyix = kid;
ni = NULL;
}
error = 0;