From owner-svn-src-all@FreeBSD.ORG  Sun Jan 15 19:45:23 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 705D1106566B;
	Sun, 15 Jan 2012 19:45:23 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5ACAD8FC08;
	Sun, 15 Jan 2012 19:45:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0FJjNEp097273;
	Sun, 15 Jan 2012 19:45:23 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0FJjNvl097270;
	Sun, 15 Jan 2012 19:45:23 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201201151945.q0FJjNvl097270@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 15 Jan 2012 19:45:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230153 - in head/sys: modules/wlan net80211
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Jan 2012 19:45:23 -0000

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 */