From 67dd0ca2547a8ce8b86b7f88b4ccee6e14abeb4c Mon Sep 17 00:00:00 2001
From: adrian <adrian@FreeBSD.org>
Date: Sun, 15 Jan 2012 19:45:23 +0000
Subject: Fix the situation where net80211 is built with IEEE80211_SUPPORT_TDMA
 but a module is used.

Although the module _builds_, it fails to load because of a missing symbol from
ieee80211_tdma.c.

Specifics:

* Always build ieee80211_tdma.c in the module;
* only compile in the code if IEEE80211_SUPPORT_TDMA is defined.
---
 sys/modules/wlan/Makefile     | 3 ++-
 sys/net80211/ieee80211_tdma.c | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile
index f96ad32..8eb83bf 100644
--- a/sys/modules/wlan/Makefile
+++ b/sys/modules/wlan/Makefile
@@ -11,7 +11,8 @@ SRCS=	ieee80211.c ieee80211_action.c ieee80211_ageq.c \
 	ieee80211_scan_sta.c ieee80211_radiotap.c ieee80211_ratectl.c \
 	ieee80211_ratectl_none.c ieee80211_regdomain.c \
 	ieee80211_ht.c ieee80211_hwmp.c ieee80211_adhoc.c ieee80211_hostap.c \
-	ieee80211_monitor.c ieee80211_sta.c ieee80211_wds.c ieee80211_ddb.c
+	ieee80211_monitor.c ieee80211_sta.c ieee80211_wds.c ieee80211_ddb.c \
+	ieee80211_tdma.c
 SRCS+=	bus_if.h device_if.h opt_inet.h opt_inet6.h opt_ipx.h opt_wlan.h \
 	opt_ddb.h
 
diff --git a/sys/net80211/ieee80211_tdma.c b/sys/net80211/ieee80211_tdma.c
index 077b9e4..ece82ff 100644
--- a/sys/net80211/ieee80211_tdma.c
+++ b/sys/net80211/ieee80211_tdma.c
@@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$");
 #include "opt_tdma.h"
 #include "opt_wlan.h"
 
+#ifdef	IEEE80211_SUPPORT_TDMA
+
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   
@@ -820,3 +822,5 @@ restart:
 	return ERESTART;
 }
 IEEE80211_IOCTL_SET(tdma, tdma_ioctl_set80211);
+
+#endif	/* IEEE80211_SUPPORT_TDMA */
-- 
cgit v1.1