From f88b3f22ac98dd4e004276026d5b84101ebb85cb Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Tue, 26 Sep 2006 12:41:13 +0000
Subject: Now that we have COMPAT_FREEBSD6 officially, use it from
 opt_compat.h.

---
 sys/modules/wlan/Makefile      | 5 ++++-
 sys/net80211/ieee80211_ioctl.c | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'sys')

diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile
index 4389c5a30f18..6b7ac1f047cd 100644
--- a/sys/modules/wlan/Makefile
+++ b/sys/modules/wlan/Makefile
@@ -6,9 +6,12 @@ KMOD=	wlan
 SRCS=	ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c \
 	ieee80211_freebsd.c ieee80211_input.c ieee80211_ioctl.c \
 	ieee80211_node.c ieee80211_output.c ieee80211_proto.c
-SRCS+=	bus_if.h device_if.h opt_inet.h opt_ipx.h
+SRCS+=	bus_if.h device_if.h opt_compat.h opt_inet.h opt_ipx.h
 
 .if !defined(KERNBUILDDIR)
+opt_compat.h:
+	echo "#define COMPAT_FREEBSD6" > ${.TARGET}
+
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
 
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index db619e356a8c..e73648f9f894 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -33,6 +33,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_compat.h"
+
 /*
  * IEEE 802.11 ioctl support (FreeBSD-specific)
  */
@@ -975,7 +977,6 @@ ieee80211_ioctl_getstastats(struct ieee80211com *ic, struct ieee80211req *ireq)
 	return error;
 }
 
-#define COMPAT_FREEBSD6
 #ifdef COMPAT_FREEBSD6
 #define	IEEE80211_IOC_SCAN_RESULTS_OLD	24
 
-- 
cgit v1.3