From owner-p4-projects@FreeBSD.ORG Tue Apr 24 22:35:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16DE716A409; Tue, 24 Apr 2007 22:35:47 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9482516A400 for ; Tue, 24 Apr 2007 22:35:47 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8437313C458 for ; Tue, 24 Apr 2007 22:35:47 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3OMZlX2033329 for ; Tue, 24 Apr 2007 22:35:47 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3OMZlkX033326 for perforce@freebsd.org; Tue, 24 Apr 2007 22:35:47 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 24 Apr 2007 22:35:47 GMT Message-Id: <200704242235.l3OMZlkX033326@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 118758 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Apr 2007 22:35:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=118758 Change 118758 by zec@zec_tca51 on 2007/04/24 22:35:11 A hack to allow for lo0 to be destroyed when cleaning up a vnet instance. Affected files ... .. //depot/projects/vimage/src/sys/net/if_loop.c#12 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_loop.c#12 (text+ko) ==== @@ -211,12 +211,24 @@ static int vnet_loif_idetach(void) { INIT_VNET_NET(curvnet); - struct lo_softc *lop, *nlop; + struct lo_softc *sc, *nsc; + + LIST_FOREACH_SAFE(sc, &V_lo_list, sc_next, nsc) { + struct ifnet *ifp = sc->sc_ifp; - LIST_FOREACH_SAFE(lop, &V_lo_list, sc_next, nlop) { - if (lop->sc_ifp == V_loif) + if (ifp == V_loif) { + /* + * A hack to allow lo0 to be detached: + * bump if_unit number from 0 to 1. By + * setting V_loif to NULL we prevent queuing + * of routing messages that would have + * m_pkthdr.rcvif pointing to a nonexisting + * ifnet, i.e. the lo0 we just destroyed. + */ + ifp->if_dunit = 1; V_loif = NULL; - lo_clone_destroy(lop->sc_ifp); + } + if_clone_destroy(ifp->if_xname); } return 0; }