Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Nov 2015 01:54:58 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r291351 - head/sys/net80211
Message-ID:  <201511260154.tAQ1swWi014092@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adrian
Date: Thu Nov 26 01:54:58 2015
New Revision: 291351
URL: https://svnweb.freebsd.org/changeset/base/291351

Log:
  [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.)

Modified:
  head/sys/net80211/ieee80211_ioctl.c

Modified: head/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- head/sys/net80211/ieee80211_ioctl.c	Thu Nov 26 01:54:09 2015	(r291350)
+++ head/sys/net80211/ieee80211_ioctl.c	Thu Nov 26 01:54:58 2015	(r291351)
@@ -2807,6 +2807,9 @@ ieee80211_ioctl_set80211(struct ieee8021
 		/* 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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511260154.tAQ1swWi014092>