diff options
| author | Sam Leffler <sam@FreeBSD.org> | 2006-02-21 23:51:19 +0000 |
|---|---|---|
| committer | Sam Leffler <sam@FreeBSD.org> | 2006-02-21 23:51:19 +0000 |
| commit | 386d84f60e3a38eb6dc45697fdfbe87d3d8d37aa (patch) | |
| tree | e7eb057bc352de6bdba251e9a4261a53a418c830 /sys/net80211 | |
| parent | ca95b5146adf136993166ee524ba047a76c1d7d6 (diff) | |
| download | src-386d84f60e3a38eb6dc45697fdfbe87d3d8d37aa.tar.gz src-386d84f60e3a38eb6dc45697fdfbe87d3d8d37aa.zip | |
honor user-specified key index for global key slots
Submitted by: Joe Love
Reviewed by: avatar
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=155885
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_ioctl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 5ef51d70dd87..363b19420040 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -1728,6 +1728,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; |