Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.149.4.11 retrieving revision 1.181 diff -u -p -r1.149.4.11 -r1.181 --- src/sys/netinet6/ip6_input.c 2017/08/28 17:53:12 1.149.4.11 +++ src/sys/netinet6/ip6_input.c 2017/07/27 06:59:28 1.181 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_input.c,v 1.149.4.11 2017/08/28 17:53:12 skrll Exp $ */ +/* $NetBSD: ip6_input.c,v 1.181 2017/07/27 06:59:28 ozaki-r Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.149.4.11 2017/08/28 17:53:12 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.181 2017/07/27 06:59:28 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_gateway.h" @@ -428,7 +428,7 @@ ip6_input(struct mbuf *m, struct ifnet * * to the usage conflict. * in6_setscope() then also checks and rejects the cases where src or * dst are the loopback address and the receiving interface - * is not loopback. + * is not loopback. */ if (__predict_false( m_makewritable(&m, 0, sizeof(struct ip6_hdr), M_DONTWAIT))) @@ -854,7 +854,7 @@ ip6_getdstifaddr(struct mbuf *m) * rtalertp - XXX: should be stored more smart way */ int -ip6_hopopts_input(u_int32_t *plenp, u_int32_t *rtalertp, +ip6_hopopts_input(u_int32_t *plenp, u_int32_t *rtalertp, struct mbuf **mp, int *offp) { struct mbuf *m = *mp; @@ -899,7 +899,7 @@ ip6_hopopts_input(u_int32_t *plenp, u_in * opthead + hbhlen is located in continuous memory region. */ static int -ip6_process_hopopts(struct mbuf *m, u_int8_t *opthead, int hbhlen, +ip6_process_hopopts(struct mbuf *m, u_int8_t *opthead, int hbhlen, u_int32_t *rtalertp, u_int32_t *plenp) { struct ip6_hdr *ip6; @@ -1074,7 +1074,7 @@ ip6_unknown_opt(u_int8_t *optp, struct m * you are using IP6_EXTHDR_CHECK() not m_pulldown()) */ void -ip6_savecontrol(struct in6pcb *in6p, struct mbuf **mp, +ip6_savecontrol(struct in6pcb *in6p, struct mbuf **mp, struct ip6_hdr *ip6, struct mbuf *m) { struct socket *so = in6p->in6p_socket;