From b2e0866d3715193b0c977023837a02259a3a8086 Mon Sep 17 00:00:00 2001 From: Martin Pieuchot Date: Fri, 22 Jul 2016 11:14:42 +0000 Subject: Revert in_selectsrc() refactoring, it breaks IPv6. Reported by Heiko on bugs@. ok stsp@, claudio@ --- sys/netinet6/ip6_var.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sys/netinet6/ip6_var.h') diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index 064221e6275..119ca5457af 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_var.h,v 1.61 2016/07/20 18:51:50 vgross Exp $ */ +/* $OpenBSD: ip6_var.h,v 1.62 2016/07/22 11:14:41 mpi Exp $ */ /* $KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $ */ /* @@ -294,10 +294,9 @@ int rip6_sysctl(int *, u_int, void *, size_t *, void *, size_t); int dest6_input(struct mbuf **, int *, int); int none_input(struct mbuf **, int *, int); -int in6_pcbselsrc(struct in6_addr **, struct sockaddr_in6 *, - struct inpcb *, struct ip6_pktopts *); int in6_selectsrc(struct in6_addr **, struct sockaddr_in6 *, - struct ip6_moptions *, struct route_in6 *, u_int); + struct ip6_pktopts *, struct ip6_moptions *, struct route_in6 *, + struct in6_addr *, u_int); struct rtentry *in6_selectroute(struct sockaddr_in6 *, struct ip6_pktopts *, struct route_in6 *, unsigned int rtableid); -- cgit v1.2.3