Date: Tue, 2 Aug 2005 17:00:05 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 81340 for review Message-ID: <200508021700.j72H05ld006970@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508021700.j72H05ld006970>