PERFORCE change 81340 for review

[Robert Watson]

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

Change 81340 by rwatson at 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);