From owner-svn-src-head@FreeBSD.ORG  Sat Dec 18 20:23:28 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 900541065670;
	Sat, 18 Dec 2010 20:23:28 +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 7E7DB8FC17;
	Sat, 18 Dec 2010 20:23:28 +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 oBIKNSen028253;
	Sat, 18 Dec 2010 20:23:28 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBIKNS64028251;
	Sat, 18 Dec 2010 20:23:28 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201012182023.oBIKNS64028251@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sat, 18 Dec 2010 20:23:28 +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: r216538 - 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:23:28 -0000

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

Log:
  Add a comment explaining the undefs, while here remove one which is not
  required.

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:22:15 2010	(r216537)
+++ head/usr.sbin/wpa/hostapd/driver_freebsd.c	Sat Dec 18 20:23:28 2010	(r216538)
@@ -401,10 +401,13 @@ bsd_set_opt_ie(void *priv, const u8 *ie,
 			    ie, ie_len);
 }
 
+/*
+ * Avoid conflicts with hostapd definitions by undefining couple of defines
+ * from net80211 header files.
+ */
 #undef RSN_VERSION
 #undef WPA_VERSION
 #undef WPA_OUI_TYPE
-#undef WME_OUI_TYPE
 
 static int bsd_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
     int reason_code);