Re: struct ifnet locking [was Re: IFEF_MPSAFE]

[Ryota Ozaki <ozaki.ryota%gmail.com@localhost>]

On Fri, Dec 22, 2017 at 11:33 AM, Ryota Ozaki <ozaki.ryota%gmail.com@localhost> wrote:
> On Thu, Dec 21, 2017 at 7:45 PM, Frank Kardel <kardel%netbsd.org@localhost> wrote:
>> Hi,
>>
>> does this panic (with -current/amd64 as of 20171221) ring a bell with
>> anyone?
>
> Yes. Could you try the patch below?

Oops. The patch was wrong... Please use the new one below.

  ozaki-r

diff --git a/sys/net/if.c b/sys/net/if.c
index 05ac3b2273c..6c867cdce0a 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -3598,7 +3598,7 @@ if_mcast_op(ifnet_t *ifp, const unsigned long
cmd, const struct sockaddr *sa)
        struct ifreq ifr;

        /* CARP still doesn't deal with the lock yet */
-#if !defined(NCARP) || (NCARP == 0)
+#if (!defined(NCARP) || (NCARP == 0)) && !defined(MROUTER)
        KASSERT(IFNET_LOCKED(ifp));
 #endif
        if (ifp->if_mcastop != NULL)