[src/netbsd-8]: src/sys/net Pull up following revision(s) (requested by ozaki...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/85e3dfe999cc
branches:  netbsd-8
changeset: 434547:85e3dfe999cc
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Jan 13 05:43:44 2018 +0000

description:
Pull up following revision(s) (requested by ozaki-r in ticket #487):
        sys/net/if.c: revision 1.417
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 51f02c12809e -r 85e3dfe999cc sys/net/if.c
--- a/sys/net/if.c      Sat Jan 13 05:41:38 2018 +0000
+++ b/sys/net/if.c      Sat Jan 13 05:43:44 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if.c,v 1.394.2.5 2018/01/13 05:41:38 snj Exp $ */
+/*     $NetBSD: if.c,v 1.394.2.6 2018/01/13 05:43:44 snj 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.394.2.5 2018/01/13 05:41:38 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.394.2.6 2018/01/13 05:43:44 snj 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>
@@ -3561,8 +3561,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)