From owner-p4-projects@FreeBSD.ORG Sun Aug 5 16:15:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E503D16A420; Sun, 5 Aug 2007 16:15:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A0BB816A417 for ; Sun, 5 Aug 2007 16:15:52 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9E32313C46B for ; Sun, 5 Aug 2007 16:15:52 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l75GFq5L018118 for ; Sun, 5 Aug 2007 16:15:52 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l75GFqWW018115 for perforce@freebsd.org; Sun, 5 Aug 2007 16:15:52 GMT (envelope-from zec@FreeBSD.org) Date: Sun, 5 Aug 2007 16:15:52 GMT Message-Id: <200708051615.l75GFqWW018115@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 124733 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: Sun, 05 Aug 2007 16:15:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=124733 Change 124733 by zec@zec_tpx32 on 2007/08/05 16:15:25 When detaching an ifnet clear its if_vnet field, so that we know it's a homeless entity until it gets reattached. Do not announce ifnet events to devctl/devd, except for ifnets attached to the default vnet (vnet_0). Affected files ... .. //depot/projects/vimage/src/sys/net/if.c#19 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if.c#19 (text+ko) ==== @@ -490,7 +490,7 @@ void if_free_type(struct ifnet *ifp, u_char type) { - INIT_VNET_NET(ifp->if_vnet); + INIT_VNET_NET(curvnet); /* ifp->if_vnet can be NULL here ! */ if (ifp != ifnet_byindex(ifp->if_index)) { if_printf(ifp, "%s: value was not if_alloced, skipping\n", @@ -631,6 +631,9 @@ if_attachdomain1(ifp); EVENTHANDLER_INVOKE(ifnet_arrival_event, ifp); +#ifdef VIMAGE + if (IS_VNET_0(curvnet)) +#endif devctl_notify("IFNET", ifp->if_xname, "ATTACH", NULL); /* Announce the interface. */ @@ -850,6 +853,9 @@ /* Announce that the interface is gone. */ rt_ifannouncemsg(ifp, IFAN_DEPARTURE); EVENTHANDLER_INVOKE(ifnet_departure_event, ifp); +#ifdef VIMAGE + if (IS_VNET_0(curvnet)) +#endif devctl_notify("IFNET", ifp->if_xname, "DETACH", NULL); IF_AFDATA_LOCK(ifp); @@ -868,6 +874,9 @@ knlist_destroy(&ifp->if_klist); mtx_destroy(&ifp->if_snd.ifq_mtx); IF_AFDATA_DESTROY(ifp); +#ifdef VIMAGE + ifp->if_vnet = NULL; +#endif splx(s); } @@ -1509,6 +1518,9 @@ (*lagg_linkstate_p)(ifp, link_state); } +#ifdef VIMAGE + if (IS_VNET_0(curvnet)) +#endif devctl_notify("IFNET", ifp->if_xname, (link_state == LINK_STATE_UP) ? "LINK_UP" : "LINK_DOWN", NULL); if (pending > 1)