From 7f5fd9f20e1133d0965102412601a41505cdf628 Mon Sep 17 00:00:00 2001
From: bschmidt <bschmidt@FreeBSD.org>
Date: Sat, 18 Dec 2010 20:23:28 +0000
Subject: Add a comment explaining the undefs, while here remove one which is
 not required.

---
 usr.sbin/wpa/hostapd/driver_freebsd.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'usr.sbin/wpa')

diff --git a/usr.sbin/wpa/hostapd/driver_freebsd.c b/usr.sbin/wpa/hostapd/driver_freebsd.c
index 8b7adff..48b942d 100644
--- a/usr.sbin/wpa/hostapd/driver_freebsd.c
+++ b/usr.sbin/wpa/hostapd/driver_freebsd.c
@@ -401,10 +401,13 @@ bsd_set_opt_ie(void *priv, const u8 *ie, size_t ie_len)
 			    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);
-- 
cgit v1.1