From owner-svn-src-head@FreeBSD.ORG  Tue Mar 24 17:22:11 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0350010658ED;
	Tue, 24 Mar 2009 17:22:11 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E401C8FC21;
	Tue, 24 Mar 2009 17:22:10 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2OHMA7V051984;
	Tue, 24 Mar 2009 17:22:10 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2OHMAxT051982;
	Tue, 24 Mar 2009 17:22:10 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200903241722.n2OHMAxT051982@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Tue, 24 Mar 2009 17:22:10 +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: r190381 - in head/sys: conf net80211
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Mar 2009 17:22:13 -0000

Author: sam
Date: Tue Mar 24 17:22:10 2009
New Revision: 190381
URL: http://svn.freebsd.org/changeset/base/190381

Log:
  use IEEE80211_SUPPORT_TDMA option to control whether code is
  configured; this allows us to remove an #ifdef

Modified:
  head/sys/conf/files
  head/sys/net80211/ieee80211_tdma.c

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Tue Mar 24 17:14:34 2009	(r190380)
+++ head/sys/conf/files	Tue Mar 24 17:22:10 2009	(r190381)
@@ -2215,7 +2215,7 @@ net80211/ieee80211_rssadapt.c	optional w
 net80211/ieee80211_scan.c	optional wlan
 net80211/ieee80211_scan_sta.c	optional wlan
 net80211/ieee80211_sta.c	optional wlan
-net80211/ieee80211_tdma.c	optional wlan
+net80211/ieee80211_tdma.c	optional wlan ieee80211_support_tdma
 net80211/ieee80211_wds.c	optional wlan
 net80211/ieee80211_xauth.c	optional wlan wlan_xauth
 netatalk/aarp.c			optional netatalk

Modified: head/sys/net80211/ieee80211_tdma.c
==============================================================================
--- head/sys/net80211/ieee80211_tdma.c	Tue Mar 24 17:14:34 2009	(r190380)
+++ head/sys/net80211/ieee80211_tdma.c	Tue Mar 24 17:22:10 2009	(r190381)
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_wlan.h"
 
-#ifdef IEEE80211_SUPPORT_TDMA
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   
@@ -787,4 +786,3 @@ ieee80211_tdma_ioctl_set80211(struct iee
 	}
 	return 0;
 }
-#endif /* IEEE80211_SUPPORT_TDMA */