From owner-svn-src-all@FreeBSD.ORG  Sun Mar 10 04:38:07 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 148DBB73;
 Sun, 10 Mar 2013 04:38:07 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F03C2B40;
 Sun, 10 Mar 2013 04:38:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2A4c677049386;
 Sun, 10 Mar 2013 04:38:06 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2A4c61V049385;
 Sun, 10 Mar 2013 04:38:06 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201303100438.r2A4c61V049385@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 10 Mar 2013 04:38:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248127 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 10 Mar 2013 04:38:07 -0000

Author: adrian
Date: Sun Mar 10 04:38:06 2013
New Revision: 248127
URL: http://svnweb.freebsd.org/changeset/base/248127

Log:
  Kill this, it's not needed at this point and (hopefully) the parent
  has correctly locked the ic/vap.

Modified:
  head/sys/net80211/ieee80211_superg.c

Modified: head/sys/net80211/ieee80211_superg.c
==============================================================================
--- head/sys/net80211/ieee80211_superg.c	Sun Mar 10 03:52:35 2013	(r248126)
+++ head/sys/net80211/ieee80211_superg.c	Sun Mar 10 04:38:06 2013	(r248127)
@@ -534,8 +534,6 @@ ff_flush(struct mbuf *head, struct mbuf 
 	struct ieee80211_node *ni;
 	struct ieee80211vap *vap;
 
-	IEEE80211_TX_LOCK_ASSERT(vap->iv_ic);
-
 	for (m = head; m != last; m = next) {
 		next = m->m_nextpkt;
 		m->m_nextpkt = NULL;