Re: Test wanted: IPv4 forwarding w/o KERNEL_LOCK()

[Martin Pieuchot]

On 28/05/17(Sun) 16:11, Hrvoje Popovski wrote:
> On 28.5.2017. 15:07, Alexander Bluhm wrote:
> > After committing some cleanup mpi@'s diff looks like this now.
> > 
> > bluhm
> 
> 
> Hi all,
> 
> with cvs tree fetched few minutes ago and with this diff i'm getting
> traces in attchment.

Thanks for the report, I just committed the fix below.

Index: net/if_trunk.c
===================================================================
RCS file: /cvs/src/sys/net/if_trunk.c,v
retrieving revision 1.130
diff -u -p -r1.130 if_trunk.c
--- net/if_trunk.c      28 May 2017 09:38:32 -0000      1.130
+++ net/if_trunk.c      28 May 2017 14:23:16 -0000
@@ -210,16 +210,18 @@ trunk_clone_destroy(struct ifnet *ifp)
 {
        struct trunk_softc *tr = (struct trunk_softc *)ifp->if_softc;
        struct trunk_port *tp;
-       int error;
+       int s, error;
 
        /* Remove any multicast groups that we may have joined. */
        trunk_ether_purgemulti(tr);
 
        /* Shutdown and remove trunk ports, return on error */
+       NET_LOCK(s);
        while ((tp = SLIST_FIRST(&tr->tr_ports)) != NULL) {
                if ((error = trunk_port_destroy(tp)) != 0)
                        return (error);
        }
+       NET_UNLOCK(s);
 
        ifmedia_delete_instance(&tr->tr_media, IFM_INST_ANY);
        ether_ifdetach(ifp);