From owner-svn-src-head@freebsd.org  Thu Nov 26 01:54:59 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E865CA3615C;
 Thu, 26 Nov 2015 01:54:59 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B8AF61DD1;
 Thu, 26 Nov 2015 01:54:59 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAQ1swmx014093;
 Thu, 26 Nov 2015 01:54:58 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAQ1swWi014092;
 Thu, 26 Nov 2015 01:54:58 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201511260154.tAQ1swWi014092@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 26 Nov 2015 01:54:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291351 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Nov 2015 01:55:00 -0000

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;