60c60
< __FBSDID("$FreeBSD: head/sys/netinet/ip_encap.c 201145 2009-12-28 22:56:30Z antoine $");
---
> __FBSDID("$FreeBSD: head/sys/netinet/ip_encap.c 269699 2014-08-08 01:57:15Z kevlo $");
87d86
< #include <netinet6/ip6protosw.h>
118,119c117,118
< void
< encap4_input(struct mbuf *m, int off)
---
> int
> encap4_input(struct mbuf **mp, int *offp, int proto)
122c121
< int proto;
---
> struct mbuf *m;
126c125
< int prio, matchprio;
---
> int matchprio, off, prio;
127a127,128
> m = *mp;
> off = *offp;
129c130
< proto = ip->ip_p;
---
> *mp = NULL;
191c192,193
< (*psw->pr_input)(m, off);
---
> *mp = m;
> (*psw->pr_input)(mp, offp, proto);
194c196
< return;
---
> return (IPPROTO_DONE);
198c200,201
< rip_input(m, off);
---
> *mp = m;
> return (rip_input(mp, offp, proto));
209c212
< const struct ip6protosw *psw;
---
> const struct protosw *psw;
255c258
< psw = (const struct ip6protosw *)match->psw;
---
> psw = match->psw;