summaryrefslogtreecommitdiffstats
path: root/usr.sbin/wpa
diff options
context:
space:
mode:
authorbschmidt <bschmidt@FreeBSD.org>2010-12-18 20:23:28 +0000
committerbschmidt <bschmidt@FreeBSD.org>2010-12-18 20:23:28 +0000
commit7f5fd9f20e1133d0965102412601a41505cdf628 (patch)
tree7f2b8738dd98048683dd14ed7f25bef082d9f817 /usr.sbin/wpa
parentae056a24592d9ef28ce8dd5968a39335abf7044f (diff)
downloadFreeBSD-src-7f5fd9f20e1133d0965102412601a41505cdf628.zip
FreeBSD-src-7f5fd9f20e1133d0965102412601a41505cdf628.tar.gz
Add a comment explaining the undefs, while here remove one which is not
required.
Diffstat (limited to 'usr.sbin/wpa')
-rw-r--r--usr.sbin/wpa/hostapd/driver_freebsd.c5
1 files changed, 4 insertions, 1 deletions
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);
OpenPOWER on IntegriCloud