--- sys/netinet6/in6_pcb.h	(svn+ssh://svn.freebsd.org/base/head)	(revision 261548)
+++ sys/netinet6/in6_pcb.h	(working copy)
@@ -77,7 +77,7 @@ struct inpcbgroup *
 	in6_pcbgroup_bymbuf(struct inpcbinfo *, struct mbuf *);
 struct	inpcbgroup *
 	in6_pcbgroup_bytuple(struct inpcbinfo *, const struct in6_addr *,
-	    u_short, const struct in6_addr *, u_short);
+	    u_short, const struct in6_addr *, u_short, uint32_t);
 
 void	in6_pcbpurgeif0(struct inpcbinfo *, struct ifnet *);
 void	in6_losing(struct inpcb *);
@@ -86,20 +86,14 @@ int	in6_pcbconnect(struct inpcb *, struct sockaddr
 int	in6_pcbconnect_mbuf(struct inpcb *, struct sockaddr *,
 	    struct ucred *, struct mbuf *);
 void	in6_pcbdisconnect(struct inpcb *);
-int	in6_pcbladdr(struct inpcb *, struct sockaddr *, struct in6_addr *);
 struct	inpcb *
-	in6_pcblookup_local(struct inpcbinfo *,
-				 struct in6_addr *, u_short, int,
-				 struct ucred *);
+	in6_pcblookup_local(struct inpcbinfo *, struct in6_addr *, uint32_t,
+	    u_short, int, struct ucred *);
 struct	inpcb *
 	in6_pcblookup(struct inpcbinfo *, struct in6_addr *,
 			   u_int, struct in6_addr *, u_int, int,
 			   struct ifnet *);
 struct	inpcb *
-	in6_pcblookup_hash_locked(struct inpcbinfo *, struct in6_addr *,
-			   u_int, struct in6_addr *, u_int, int,
-			   struct ifnet *);
-struct	inpcb *
 	in6_pcblookup_mbuf(struct inpcbinfo *, struct in6_addr *,
 			   u_int, struct in6_addr *, u_int, int,
 			   struct ifnet *ifp, struct mbuf *);
@@ -109,7 +103,7 @@ void	in6_pcbnotify(struct inpcbinfo *, struct sock
 struct inpcb *
 	in6_rtchange(struct inpcb *, int);
 struct sockaddr *
-	in6_sockaddr(in_port_t port, struct in6_addr *addr_p);
+	in6_sockaddr(in_port_t, const struct in6_addr *, uint32_t);
 struct sockaddr *
 	in6_v4mapsin6_sockaddr(in_port_t port, struct in_addr *addr_p);
 int	in6_getpeeraddr(struct socket *so, struct sockaddr **nam);