From owner-svn-src-head@FreeBSD.ORG  Sat Dec 18 20:25:25 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED5631065673;
	Sat, 18 Dec 2010 20:25:25 +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 DBCF78FC1B;
	Sat, 18 Dec 2010 20:25:25 +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 oBIKPPhU028365;
	Sat, 18 Dec 2010 20:25:25 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBIKPP8M028363;
	Sat, 18 Dec 2010 20:25:25 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201012182025.oBIKPP8M028363@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sat, 18 Dec 2010 20:25:25 +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: r216539 - head/usr.sbin/wpa/hostapd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Dec 2010 20:25:26 -0000

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

Log:
  Change order in wpa_driver_bsd_ops to match upstream code. Add description
  while here.

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:23:28 2010	(r216538)
+++ head/usr.sbin/wpa/hostapd/driver_freebsd.c	Sat Dec 18 20:25:25 2010	(r216539)
@@ -789,23 +789,24 @@ bsd_deinit(void *priv)
 
 const struct wpa_driver_ops wpa_driver_bsd_ops = {
 	.name			= "bsd",
+	.desc			= "BSD 802.11 support",
 	.hapd_init		= bsd_init,
 	.hapd_deinit		= bsd_deinit,
-	.set_ieee8021x		= bsd_set_ieee8021x,
 	.set_privacy		= bsd_set_privacy,
-	.set_key		= bsd_set_key,
 	.get_seqnum		= bsd_get_seqnum,
 	.flush			= bsd_flush,
-	.set_generic_elem	= bsd_set_opt_ie,
-	.sta_set_flags		= bsd_set_sta_authorized,
 	.read_sta_data		= bsd_read_sta_driver_data,
-	.hapd_send_eapol	= bsd_send_eapol,
+	.sta_clear_stats	= bsd_sta_clear_stats,
 	.sta_disassoc		= bsd_sta_disassoc,
 	.sta_deauth		= bsd_sta_deauth,
+	.set_key		= bsd_set_key,
+	.set_ieee8021x		= bsd_set_ieee8021x,
 	.hapd_set_ssid		= bsd_set_ssid,
 	.hapd_get_ssid		= bsd_get_ssid,
+	.hapd_send_eapol	= bsd_send_eapol,
+	.sta_set_flags		= bsd_set_sta_authorized,
+	.set_generic_elem	= bsd_set_opt_ie,
 	.set_countermeasures	= bsd_set_countermeasures,
-	.sta_clear_stats        = bsd_sta_clear_stats,
 	.commit			= bsd_commit,
 #ifdef CONFIG_DRIVER_RADIUS_ACL_NOT_YET
 	.set_radius_acl_auth	= bsd_set_radius_acl_auth,