[src/trunk]: src/sys/net Suppress the assertion of IFNET_LOCK in if_mcast_op ...

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

details:   https://anonhg.NetBSD.org/src/rev/082c437b933f
branches:  trunk
changeset: 358368:082c437b933f
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Tue Dec 26 02:01:35 2017 +0000

description:
Suppress the assertion of IFNET_LOCK in if_mcast_op if MROUTING

MROUTING doesn't deal with IFNET_LOCK yet.

Reported by kardel@

diffstat:

 sys/net/if.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 8207276a86f4 -r 082c437b933f sys/net/if.c
--- a/sys/net/if.c      Mon Dec 25 17:00:15 2017 +0000
+++ b/sys/net/if.c      Tue Dec 26 02:01:35 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if.c,v 1.416 2017/12/15 04:04:58 ozaki-r Exp $ */
+/*     $NetBSD: if.c,v 1.417 2017/12/26 02:01:35 ozaki-r Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,16 +90,16 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.416 2017/12/15 04:04:58 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.417 2017/12/26 02:01:35 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #include "opt_ipsec.h"
-
 #include "opt_atalk.h"
 #include "opt_natm.h"
 #include "opt_wlan.h"
 #include "opt_net_mpsafe.h"
+#include "opt_mrouting.h"
 #endif
 
 #include <sys/param.h>
@@ -3597,8 +3597,8 @@
        int rc;
        struct ifreq ifr;
 
-       /* CARP still doesn't deal with the lock yet */
-#if !defined(NCARP) || (NCARP == 0)
+       /* CARP and MROUTING still don't deal with the lock yet */
+#if (!defined(NCARP) || (NCARP == 0)) && !defined(MROUTING)
        KASSERT(IFNET_LOCKED(ifp));
 #endif
        if (ifp->if_mcastop != NULL)