Module Name: src Committed By: roy Date: Mon Jan 13 18:57:49 UTC 2014
Modified Files: src/sys/netinet6: in6.c in6_var.h Log Message: Remove the now un-used function in6ifa_ifplocaladdr. To generate a diff of this commit: cvs rdiff -u -r1.167 -r1.168 src/sys/netinet6/in6.c cvs rdiff -u -r1.67 -r1.68 src/sys/netinet6/in6_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netinet6/in6.c diff -u src/sys/netinet6/in6.c:1.167 src/sys/netinet6/in6.c:1.168 --- src/sys/netinet6/in6.c:1.167 Wed Sep 11 23:15:47 2013 +++ src/sys/netinet6/in6.c Mon Jan 13 18:57:48 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: in6.c,v 1.167 2013/09/11 23:15:47 christos Exp $ */ +/* $NetBSD: in6.c,v 1.168 2014/01/13 18:57:48 roy Exp $ */ /* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.167 2013/09/11 23:15:47 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.168 2014/01/13 18:57:48 roy Exp $"); #include "opt_inet.h" #include "opt_compat_netbsd.h" @@ -1870,32 +1870,6 @@ bestia(struct in6_ifaddr *best_ia, struc } /* - * find the internet address on a given interface corresponding to a neighbor's - * address. - */ -struct in6_ifaddr * -in6ifa_ifplocaladdr(const struct ifnet *ifp, const struct in6_addr *addr) -{ - struct ifaddr *ifa; - struct in6_ifaddr *best_ia = NULL, *ia; - - IFADDR_FOREACH(ifa, ifp) { - if (ifa->ifa_addr == NULL) - continue; /* just for safety */ - if (ifa->ifa_addr->sa_family != AF_INET6) - continue; - ia = (struct in6_ifaddr *)ifa; - if (!IN6_ARE_MASKED_ADDR_EQUAL(addr, - &ia->ia_addr.sin6_addr, - &ia->ia_prefixmask.sin6_addr)) - continue; - best_ia = bestia(best_ia, ia); - } - - return best_ia; -} - -/* * Convert IP6 address to printable (loggable) representation. */ static int ip6round = 0; Index: src/sys/netinet6/in6_var.h diff -u src/sys/netinet6/in6_var.h:1.67 src/sys/netinet6/in6_var.h:1.68 --- src/sys/netinet6/in6_var.h:1.67 Thu Jan 2 18:29:01 2014 +++ src/sys/netinet6/in6_var.h Mon Jan 13 18:57:49 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: in6_var.h,v 1.67 2014/01/02 18:29:01 pooka Exp $ */ +/* $NetBSD: in6_var.h,v 1.68 2014/01/13 18:57:49 roy Exp $ */ /* $KAME: in6_var.h,v 1.81 2002/06/08 11:16:51 itojun Exp $ */ /* @@ -694,8 +694,6 @@ void in6_ifaddloop(struct ifaddr *); void in6_createmkludge(struct ifnet *); void in6_purgemkludge(struct ifnet *); struct in6_ifaddr *in6ifa_ifpforlinklocal(const struct ifnet *, int); -struct in6_ifaddr *in6ifa_ifplocaladdr(const struct ifnet *, - const struct in6_addr *); struct in6_ifaddr *in6ifa_ifpwithaddr(const struct ifnet *, const struct in6_addr *); char *ip6_sprintf(const struct in6_addr *);