diff options
| -rw-r--r-- | sys/net/if.c | 23 | ||||
| -rw-r--r-- | sys/net/if.h | 3 | ||||
| -rw-r--r-- | sys/netinet6/nd6_rtr.c | 3 |
3 files changed, 3 insertions, 26 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 1accd8f93b0..dfd0b5f527e 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.249 2013/03/07 09:03:16 mpi Exp $ */ +/* $OpenBSD: if.c,v 1.250 2013/03/07 09:40:19 mpi Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -964,27 +964,6 @@ ifa_ifwithnet(struct sockaddr *addr, u_int rdomain) } /* - * Find an interface using a specific address family - */ -struct ifaddr * -ifa_ifwithaf(int af, u_int rdomain) -{ - struct ifnet *ifp; - struct ifaddr *ifa; - - rdomain = rtable_l2(rdomain); - TAILQ_FOREACH(ifp, &ifnet, if_list) { - if (ifp->if_rdomain != rdomain) - continue; - TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) { - if (ifa->ifa_addr->sa_family == af) - return (ifa); - } - } - return (NULL); -} - -/* * Find an interface address specific to an interface best matching * a given address. */ diff --git a/sys/net/if.h b/sys/net/if.h index 6672759b1ce..5c3d4d1251a 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if.h,v 1.138 2013/03/07 09:03:16 mpi Exp $ */ +/* $OpenBSD: if.h,v 1.139 2013/03/07 09:40:19 mpi Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -837,7 +837,6 @@ void if_start(struct ifnet *); void ifnewlladdr(struct ifnet *); struct ifaddr *ifa_ifwithaddr(struct sockaddr *, u_int); -struct ifaddr *ifa_ifwithaf(int, u_int); struct ifaddr *ifa_ifwithdstaddr(struct sockaddr *, u_int); struct ifaddr *ifa_ifwithnet(struct sockaddr *, u_int); struct ifaddr *ifa_ifwithroute(int, struct sockaddr *, diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 953911309c0..a1fd026c7db 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_rtr.c,v 1.66 2013/03/04 14:42:25 bluhm Exp $ */ +/* $OpenBSD: nd6_rtr.c,v 1.67 2013/03/07 09:40:19 mpi Exp $ */ /* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */ /* @@ -1598,7 +1598,6 @@ nd6_prefix_onlink(struct nd_prefix *pr) ifa = &in6ifa_ifpforlinklocal(ifp, IN6_IFF_NOTREADY | IN6_IFF_ANYCAST)->ia_ifa; if (ifa == NULL) { - /* XXX: freebsd does not have ifa_ifwithaf */ TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) { if (ifa->ifa_addr->sa_family == AF_INET6) break; |