From owner-svn-src-all@FreeBSD.ORG  Sat Dec 18 20:17:11 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 462D41065697;
	Sat, 18 Dec 2010 20:17:11 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 34C4B8FC13;
	Sat, 18 Dec 2010 20:17:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBIKHBvJ027934;
	Sat, 18 Dec 2010 20:17:11 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBIKHB8A027932;
	Sat, 18 Dec 2010 20:17:11 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201012182017.oBIKHB8A027932@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sat, 18 Dec 2010 20:17:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216536 - head/usr.sbin/wpa/hostapd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Dec 2010 20:17:11 -0000

Author: bschmidt
Date: Sat Dec 18 20:17:10 2010
New Revision: 216536
URL: http://svn.freebsd.org/changeset/base/216536

Log:
  Import bsd_configure_wpa() to sync with upstream code.

Modified:
  head/usr.sbin/wpa/hostapd/driver_freebsd.c

Modified: head/usr.sbin/wpa/hostapd/driver_freebsd.c
==============================================================================
--- head/usr.sbin/wpa/hostapd/driver_freebsd.c	Sat Dec 18 20:15:47 2010	(r216535)
+++ head/usr.sbin/wpa/hostapd/driver_freebsd.c	Sat Dec 18 20:17:10 2010	(r216536)
@@ -264,6 +264,17 @@ bsd_set_key(const char *ifname, void *pr
 }
 
 static int
+bsd_configure_wpa(void *priv, struct wpa_bss_params *params)
+{
+	wpa_printf(MSG_DEBUG, "%s: enable WPA= 0x%x", __func__, params->wpa);
+	if (set80211param(priv, IEEE80211_IOC_WPA, params->wpa)) {
+		printf("Unable to set WPA to %u\n", params->wpa);
+		return -1;
+	}
+	return 0;
+}
+
+static int
 bsd_set_ieee8021x(void *priv, struct wpa_bss_params *params)
 {
 	wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, params->enabled);
@@ -278,7 +289,7 @@ bsd_set_ieee8021x(void *priv, struct wpa
 			   __func__);
 		return -1;
 	}
-	if (params->wpa && set80211param(priv,IEEE80211_IOC_WPA, params->wpa)) {
+	if (params->wpa && bsd_configure_wpa(priv, params) != 0) {
 		wpa_printf(MSG_ERROR, "%s: Failed to configure WPA state",
 			  __func__);
 		return -1;