From owner-svn-src-all@FreeBSD.ORG  Fri Jul 31 19:13:16 2009
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 8DC3E1065692;
	Fri, 31 Jul 2009 19:13:16 +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 7C3AD8FC25;
	Fri, 31 Jul 2009 19:13:16 +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 n6VJDGME078404;
	Fri, 31 Jul 2009 19:13:16 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6VJDGRR078402;
	Fri, 31 Jul 2009 19:13:16 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200907311913.n6VJDGRR078402@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 31 Jul 2009 19:13:16 +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: r196005 - head/sys/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: Fri, 31 Jul 2009 19:13:17 -0000

Author: sam
Date: Fri Jul 31 19:13:16 2009
New Revision: 196005
URL: http://svn.freebsd.org/changeset/base/196005

Log:
  fix misplaced #endif that caused tdma handling to be merged with ESS handling
  (causing tdma scanning to break)
  
  Approved by:	re (kib)

Modified:
  head/sys/net80211/ieee80211_scan_sta.c

Modified: head/sys/net80211/ieee80211_scan_sta.c
==============================================================================
--- head/sys/net80211/ieee80211_scan_sta.c	Fri Jul 31 19:12:19 2009	(r196004)
+++ head/sys/net80211/ieee80211_scan_sta.c	Fri Jul 31 19:13:16 2009	(r196005)
@@ -1018,8 +1018,8 @@ match_bss(struct ieee80211vap *vap,
 		else if (ms->ms_idlen != 0 &&
 		    match_id(se->se_meshid, ms->ms_id, ms->ms_idlen))
 			fail |= MATCH_MESHID;
-	} else {
 #endif
+	} else {
 		if ((se->se_capinfo & IEEE80211_CAPINFO_ESS) == 0)
 			fail |= MATCH_CAPINFO;
 		/*