From owner-p4-projects@FreeBSD.ORG  Sun Oct 30 15:38:09 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A1C6316A421; Sun, 30 Oct 2005 15:38:08 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 772E016A41F
	for <perforce@freebsd.org>; Sun, 30 Oct 2005 15:38:08 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 413DD43D45
	for <perforce@freebsd.org>; Sun, 30 Oct 2005 15:38:08 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9UFc837046178
	for <perforce@freebsd.org>; Sun, 30 Oct 2005 15:38:08 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UFc8Nw046175
	for perforce@freebsd.org; Sun, 30 Oct 2005 15:38:08 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 30 Oct 2005 15:38:08 GMT
Message-Id: <200510301538.j9UFc8Nw046175@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 86072 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Oct 2005 15:38:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=86072

Change 86072 by rwatson@rwatson_zoo on 2005/10/30 15:37:09

	Revert local change relating to interface teardown and multicast:
	this has been merged to CVS slightly differently, resulting in a
	p4 mismerge.

Affected files ...

.. //depot/projects/netsmp/src/sys/netinet/in.c#11 integrate

Differences ...

==== //depot/projects/netsmp/src/sys/netinet/in.c#11 (text+ko) ====

@@ -1064,15 +1064,3 @@
 	in_pcbpurgeif0(&ripcbinfo, ifp);
 	in_pcbpurgeif0(&udbinfo, ifp);
 }
-
-/*
- * On interface removal, clean up IPv4 data structures hung off of the ifnet.
- */
-void
-in_ifdetach(ifp)
-	struct ifnet *ifp;
-{
-
-	in_pcbpurgeif0(&ripcbinfo, ifp);
-	in_pcbpurgeif0(&udbinfo, ifp);
-}