From owner-p4-projects@FreeBSD.ORG  Tue Aug  2 17:00:06 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 5D3BA16A421; Tue,  2 Aug 2005 17:00:06 +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 1B32B16A41F
	for <perforce@freebsd.org>; Tue,  2 Aug 2005 17:00:06 +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 C63C043D48
	for <perforce@freebsd.org>; Tue,  2 Aug 2005 17:00:05 +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 j72H05IA006973
	for <perforce@freebsd.org>; Tue, 2 Aug 2005 17:00:05 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 j72H05ld006970
	for perforce@freebsd.org; Tue, 2 Aug 2005 17:00:05 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 2 Aug 2005 17:00:05 GMT
Message-Id: <200508021700.j72H05ld006970@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 81340 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: Tue, 02 Aug 2005 17:00:07 -0000

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

Change 81340 by rwatson@rwatson_zoo on 2005/08/02 16:59:31

	Replace ifmaof_ifpforaddr() with if_findmulti(), static to if.c.

Affected files ...

.. //depot/projects/netsmp/src/sys/net/if.c#6 edit
.. //depot/projects/netsmp/src/sys/net/if_var.h#4 edit

Differences ...

==== //depot/projects/netsmp/src/sys/net/if.c#6 (text+ko) ====

@@ -1827,8 +1827,8 @@
 	return (if_setflag(ifp, IFF_ALLMULTI, 0, &ifp->if_amcount, onswitch));
 }
 
-struct ifmultiaddr *
-ifmaof_ifpforaddr(struct sockaddr *sa, struct ifnet *ifp)
+static struct ifmultiaddr *
+if_findmulti(struct ifnet *ifp, struct sockaddr *sa)
 {
 	struct ifmultiaddr *ifma;
 
@@ -1843,19 +1843,6 @@
 }
 
 /*
- * XXXRW: ifmaof_ifpforaddr() is an unsensible name, and appears not to be
- * used, so use my more sensibly named version here.
- */
-static struct ifmultiaddr *
-if_findmulti(struct ifnet *ifp, struct sockaddr *sa)
-{
-
-	IF_ADDR_LOCK_ASSERT(ifp);
-
-	return (ifmaof_ifpforaddr(sa, ifp));
-}
-
-/*
  * Allocate a new ifmultiaddr and initialize based on passed arguments.  We
  * make copies of passed sockaddrs.  The ifmultiaddr will not be added to
  * the ifnet multicast address list here, so the caller must do that and

==== //depot/projects/netsmp/src/sys/net/if_var.h#4 (text+ko) ====

@@ -645,7 +645,6 @@
 struct	ifaddr *ifa_ifwithroute(int, struct sockaddr *, struct sockaddr *);
 struct	ifaddr *ifaof_ifpforaddr(struct sockaddr *, struct ifnet *);
 
-struct	ifmultiaddr *ifmaof_ifpforaddr(struct sockaddr *, struct ifnet *);
 int	if_simloop(struct ifnet *ifp, struct mbuf *m, int af, int hlen);
 
 typedef	void *if_com_alloc_t(u_char type, struct ifnet *ifp);