68c68
< __FBSDID("$FreeBSD: head/sys/netinet6/in6_pcb.c 222488 2011-05-30 09:43:55Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/netinet6/in6_pcb.c 222691 2011-06-04 16:33:06Z rwatson $");
367,368c367,368
< in6_pcbconnect(register struct inpcb *inp, struct sockaddr *nam,
< struct ucred *cred)
---
> in6_pcbconnect_mbuf(register struct inpcb *inp, struct sockaddr *nam,
> struct ucred *cred, struct mbuf *m)
408c408
< in_pcbrehash(inp);
---
> in_pcbrehash_mbuf(inp, m);
412a413,419
> int
> in6_pcbconnect(struct inpcb *inp, struct sockaddr *nam, struct ucred *cred)
> {
>
> return (in6_pcbconnect_mbuf(inp, nam, cred, NULL));
> }
>
977c984,985
< * Public inpcb lookup routines, accepting a 4-tuple.
---
> * Public inpcb lookup routines, accepting a 4-tuple, and optionally, an mbuf
> * from which a pre-calculated hash value may be extracted.
982a991,994
> KASSERT((lookupflags & ~INPLOOKUP_MASK) == 0,
> ("%s: invalid lookup flags %d", __func__, lookupflags));
> KASSERT((lookupflags & (INPLOOKUP_RLOCKPCB | INPLOOKUP_WLOCKPCB)) != 0,
> ("%s: LOCKPCB not set", __func__));
983a996,1004
> return (in6_pcblookup_hash(pcbinfo, faddr, fport, laddr, lport,
> lookupflags, ifp));
> }
>
> struct inpcb *
> in6_pcblookup_mbuf(struct inpcbinfo *pcbinfo, struct in6_addr *faddr,
> u_int fport, struct in6_addr *laddr, u_int lport, int lookupflags,
> struct ifnet *ifp, struct mbuf *m)
> {