svn commit: r216538 - head/usr.sbin/wpa/hostapd

[Bernhard Schmidt]

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);