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

[net80211] decode WPA cipher config '0' as "clear cipher config".

Browse Source 
wpa_supplicant actually calls the wpa ioctl with cipher 0 as part
of the teardown process and this returns an ioctl error.

It's required as part of the (hopefully!) upcoming encrypted
IBSS support which does indeed do the above as part of interface
setup and then exits ungracefully when it gets an ioctl error.

(I'll fix wpa_supplicant in a later commit as part of other work.)
This commit is contained in:
Adrian Chadd 2015-11-26 01:54:58 +00:00
parent 0d9e60c857
commit 913565851c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/net80211/ieee80211_ioctl.c
View File

@ -2807,6 +2807,9 @@ ieee80211_ioctl_set80211(struct ieee80211vap *vap, u_long cmd, struct ieee80211r
/* XXX verify ciphers available */ /* XXX verify ciphers available */
flags = vap->iv_flags & ~IEEE80211_F_WPA; flags = vap->iv_flags & ~IEEE80211_F_WPA;
switch (ireq->i_val) { switch (ireq->i_val) {
case 0:
/* wpa_supplicant calls this to clear the WPA config */
break;
case 1: case 1:
if (!(vap->iv_caps & IEEE80211_C_WPA1)) if (!(vap->iv_caps & IEEE80211_C_WPA1))
return EOPNOTSUPP; return EOPNOTSUPP;