From owner-svn-src-head@freebsd.org  Fri Aug 10 13:32:03 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0077C106B264;
 Fri, 10 Aug 2018 13:32:03 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id AB3BC8AE01;
 Fri, 10 Aug 2018 13:32:02 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D072CC9;
 Fri, 10 Aug 2018 13:32:02 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7ADW24k081557;
 Fri, 10 Aug 2018 13:32:02 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7ADW2Z6081556;
 Fri, 10 Aug 2018 13:32:02 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201808101332.w7ADW2Z6081556@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Fri, 10 Aug 2018 13:32:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r337571 - head/sys/net80211
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/sys/net80211
X-SVN-Commit-Revision: 337571
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2018 13:32:03 -0000

Author: kevans
Date: Fri Aug 10 13:32:02 2018
New Revision: 337571
URL: https://svnweb.freebsd.org/changeset/base/337571

Log:
  net80211: Drain ageq before cleaning it up.
  
  The comment above ieee80211_ageq_cleanup specifically notes that the queue
  is assumed to be empty, and in order to make it so, ieee80211_ageq_drain
  must be used.
  
  Submitted by:	Augustin Cavalier <waddlesplash@gmail.com>
  Obtained from:	Haiku (dffc3e235360cd7b71261239ee8507b7d62a1471)
  MFC after:	1 week

Modified:
  head/sys/net80211/ieee80211_node.c

Modified: head/sys/net80211/ieee80211_node.c
==============================================================================
--- head/sys/net80211/ieee80211_node.c	Fri Aug 10 13:06:14 2018	(r337570)
+++ head/sys/net80211/ieee80211_node.c	Fri Aug 10 13:32:02 2018	(r337571)
@@ -137,6 +137,7 @@ ieee80211_node_detach(struct ieee80211com *ic)
 
 	callout_drain(&ic->ic_inact);
 	ieee80211_node_table_cleanup(&ic->ic_sta);
+	ieee80211_ageq_drain(&ic->ic_stageq);
 	ieee80211_ageq_cleanup(&ic->ic_stageq);
 }