summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2006-09-26 12:41:13 +0000
committerru <ru@FreeBSD.org>2006-09-26 12:41:13 +0000
commit196675b4cba4461d444beee4071740898af92772 (patch)
treee53c4f3af0495a8cdedb2bf29f6d56824f4c76a4 /sys
parentd4abbeb0fe29fd402524a88f9193183261be8139 (diff)
downloadFreeBSD-src-196675b4cba4461d444beee4071740898af92772.zip
FreeBSD-src-196675b4cba4461d444beee4071740898af92772.tar.gz
Now that we have COMPAT_FREEBSD6 officially, use it from opt_compat.h.
Diffstat (limited to 'sys')
-rw-r--r--sys/modules/wlan/Makefile5
-rw-r--r--sys/net80211/ieee80211_ioctl.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile
index 4389c5a..6b7ac1f 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 db619e3..e73648f 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
OpenPOWER on IntegriCloud