From owner-svn-src-projects@FreeBSD.ORG  Wed Feb 11 17:33:37 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 506F3106566C;
	Wed, 11 Feb 2009 17:33:37 +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 3CDBA8FC1D;
	Wed, 11 Feb 2009 17:33:37 +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 n1BHXbNp031786;
	Wed, 11 Feb 2009 17:33:37 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1BHXbLq031785;
	Wed, 11 Feb 2009 17:33:37 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200902111733.n1BHXbLq031785@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Wed, 11 Feb 2009 17:33:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188491 - in projects/vap7/sys: . contrib/pf dev
	dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210
	dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212
	dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2009 17:33:37 -0000

Author: sam
Date: Wed Feb 11 17:33:36 2009
New Revision: 188491
URL: http://svn.freebsd.org/changeset/base/188491

Log:
  merge r188489: emove bogus reference reclaim on the slave-side bss
  node on beacon miss

Modified:
  projects/vap7/sys/   (props changed)
  projects/vap7/sys/contrib/pf/   (props changed)
  projects/vap7/sys/dev/   (props changed)
  projects/vap7/sys/dev/ath/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5210/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5211/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5212/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5312/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/   (props changed)
  projects/vap7/sys/dev/cxgb/   (props changed)
  projects/vap7/sys/dev/usb2/   (props changed)
  projects/vap7/sys/i386/conf/USB2   (props changed)
  projects/vap7/sys/modules/usb2/   (props changed)
  projects/vap7/sys/net80211/   (props changed)
  projects/vap7/sys/net80211/ieee80211_tdma.c

Modified: projects/vap7/sys/net80211/ieee80211_tdma.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_tdma.c	Wed Feb 11 17:32:45 2009	(r188490)
+++ projects/vap7/sys/net80211/ieee80211_tdma.c	Wed Feb 11 17:33:36 2009	(r188491)
@@ -214,7 +214,6 @@ tdma_newstate(struct ieee80211vap *vap, 
 		if (ostate == IEEE80211_S_RUN) {
 			/* purge station table; entries are stale */
 			ieee80211_iterate_nodes(&ic->ic_sta, sta_leave, vap);
-			ieee80211_free_node(vap->iv_bss);	/* XXX */
 		}
 		if (vap->iv_flags_ext & IEEE80211_FEXT_SCANREQ) {
 			ieee80211_check_scan(vap,