Module Name: src
Committed By: ozaki-r
Date: Fri Jan 13 10:38:37 UTC 2017
Modified Files:
src/sys/netinet6: icmp6.c
Log Message:
Tweak icmp6_input; always use off, not *offp
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/sys/netinet6/icmp6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.203 src/sys/netinet6/icmp6.c:1.204
--- src/sys/netinet6/icmp6.c:1.203 Mon Dec 12 03:55:57 2016
+++ src/sys/netinet6/icmp6.c Fri Jan 13 10:38:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.203 2016/12/12 03:55:57 ozaki-r Exp $ */
+/* $NetBSD: icmp6.c,v 1.204 2017/01/13 10:38:37 ozaki-r Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.203 2016/12/12 03:55:57 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.204 2017/01/13 10:38:37 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -451,7 +451,7 @@ icmp6_input(struct mbuf **mp, int *offp,
struct ip6_hdr *ip6, *nip6;
struct icmp6_hdr *icmp6, *nicmp6;
int off = *offp;
- int icmp6len = m->m_pkthdr.len - *offp;
+ int icmp6len = m->m_pkthdr.len - off;
int code, sum, noff;
struct ifnet *rcvif;
struct psref psref;
@@ -891,7 +891,7 @@ icmp6_input(struct mbuf **mp, int *offp,
m_put_rcvif_psref(rcvif, &psref);
/* deliver the packet to appropriate sockets */
- icmp6_rip6_input(&m, *offp);
+ icmp6_rip6_input(&m, off);
return IPPROTO_DONE;
