From owner-svn-src-all@FreeBSD.ORG Thu Oct 30 11:34:08 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C996F481; Thu, 30 Oct 2014 11:34:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6349D22; Thu, 30 Oct 2014 11:34:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9UBY81i073849; Thu, 30 Oct 2014 11:34:08 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9UBY8LY073848; Thu, 30 Oct 2014 11:34:08 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201410301134.s9UBY8LY073848@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Thu, 30 Oct 2014 11:34:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r273857 - head/sys/netinet6 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.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Oct 2014 11:34:08 -0000 Author: ae Date: Thu Oct 30 11:34:07 2014 New Revision: 273857 URL: https://svnweb.freebsd.org/changeset/base/273857 Log: Move ifq drain into in6m_purge(). Suggested by: bms MFC after: 1 week Sponsored by: Yandex LLC Modified: head/sys/netinet6/in6_mcast.c Modified: head/sys/netinet6/in6_mcast.c ============================================================================== --- head/sys/netinet6/in6_mcast.c Thu Oct 30 11:27:03 2014 (r273856) +++ head/sys/netinet6/in6_mcast.c Thu Oct 30 11:34:07 2014 (r273857) @@ -526,9 +526,6 @@ in6m_release_locked(struct in6_multi *in in6m_purge(inm); - /* Free state-change requests that might be queued. */ - _IF_DRAIN(&inm->in6m_scq); - free(inm, M_IP6MADDR); if_delmulti_ifma(ifma); @@ -1076,6 +1073,8 @@ in6m_purge(struct in6_multi *inm) free(ims, M_IP6MSOURCE); inm->in6m_nsrc--; } + /* Free state-change requests that might be queued. */ + _IF_DRAIN(&inm->in6m_scq); } /*