summaryrefslogtreecommitdiffstats
path: root/sys/net80211
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2015-11-26 01:54:58 +0000
committeradrian <adrian@FreeBSD.org>2015-11-26 01:54:58 +0000
commit87db22d33baaf5754a420900b2620aeed546e46d (patch)
tree0d6cdb3c05b7d570d6e839ed32cfc22cb87ca4b9 /sys/net80211
parent6fe2c2381f6885f1b56b1c4384b3e3ad0bc28d80 (diff)
downloadFreeBSD-src-87db22d33baaf5754a420900b2620aeed546e46d.zip
FreeBSD-src-87db22d33baaf5754a420900b2620aeed546e46d.tar.gz
[net80211] decode WPA cipher config '0' as "clear cipher config".
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.)
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_ioctl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 6388dac..1ca3d45 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -2807,6 +2807,9 @@ ieee80211_ioctl_set80211(struct ieee80211vap *vap, u_long cmd, struct ieee80211r
/* XXX verify ciphers available */
flags = vap->iv_flags & ~IEEE80211_F_WPA;
switch (ireq->i_val) {
+ case 0:
+ /* wpa_supplicant calls this to clear the WPA config */
+ break;
case 1:
if (!(vap->iv_caps & IEEE80211_C_WPA1))
return EOPNOTSUPP;
OpenPOWER on IntegriCloud