svn commit: r230153 - in head/sys: modules/wlan net80211

[Adrian Chadd]

Author: adrian
Date: Sun Jan 15 19:45:23 2012
New Revision: 230153
URL: http://svn.freebsd.org/changeset/base/230153

Log:
  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.

Modified:
  head/sys/modules/wlan/Makefile
  head/sys/net80211/ieee80211_tdma.c

Modified: head/sys/modules/wlan/Makefile
==============================================================================
--- head/sys/modules/wlan/Makefile	Sun Jan 15 19:43:56 2012	(r230152)
+++ head/sys/modules/wlan/Makefile	Sun Jan 15 19:45:23 2012	(r230153)
@@ -11,7 +11,8 @@ SRCS=	ieee80211.c ieee80211_action.c iee
 	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
 

Modified: head/sys/net80211/ieee80211_tdma.c
==============================================================================
--- head/sys/net80211/ieee80211_tdma.c	Sun Jan 15 19:43:56 2012	(r230152)
+++ head/sys/net80211/ieee80211_tdma.c	Sun Jan 15 19:45:23 2012	(r230153)
@@ -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 */