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);
}
/*
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
