[src/trunk]: src/sys/netinet6 Move LIST_REMOVE

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5d02aa683f00
branches:  trunk
changeset: 319418:5d02aa683f00
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Tue May 29 04:38:59 2018 +0000

description:
Move LIST_REMOVE

mld_stoptimer releases in6_multilock temporarily, so we must LIST_REMOVE first.

diffstat:

 sys/netinet6/mld6.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 8831c7b236c9 -r 5d02aa683f00 sys/netinet6/mld6.c
--- a/sys/netinet6/mld6.c       Tue May 29 04:38:29 2018 +0000
+++ b/sys/netinet6/mld6.c       Tue May 29 04:38:59 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mld6.c,v 1.97 2018/05/29 04:38:29 ozaki-r Exp $        */
+/*     $NetBSD: mld6.c,v 1.98 2018/05/29 04:38:59 ozaki-r Exp $        */
 /*     $KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $   */
 
 /*
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.97 2018/05/29 04:38:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.98 2018/05/29 04:38:59 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -896,6 +896,7 @@
 
        rw_enter(&in6_multilock, RW_WRITER);
        LIST_FOREACH_SAFE(in6m, &ifp->if_multiaddrs, in6m_entry, next) {
+               LIST_REMOVE(in6m, in6m_entry);
                /*
                 * Normally multicast addresses are already purged at this
                 * point. Remaining references aren't accessible via ifp,
@@ -903,7 +904,6 @@
                 * accessed via in6m by removing it from the list of ifp.
                 */
                mld_stoptimer(in6m);
-               LIST_REMOVE(in6m, in6m_entry);
        }
        rw_exit(&in6_multilock);
 }