Module Name: src
Committed By: martin
Date: Mon Feb 15 10:13:45 UTC 2021
Modified Files:
src/sys/netinet6: icmp6.c
Log Message:
Fix the build.
Maybe there should be a ICMP6_HDR_ALIGNMENT, but for now there is
only IP6_HDR_ALIGNMENT.
To generate a diff of this commit:
cvs rdiff -u -r1.248 -r1.249 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.248 src/sys/netinet6/icmp6.c:1.249
--- src/sys/netinet6/icmp6.c:1.248 Sun Feb 14 20:58:35 2021
+++ src/sys/netinet6/icmp6.c Mon Feb 15 10:13:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.248 2021/02/14 20:58:35 christos Exp $ */
+/* $NetBSD: icmp6.c,v 1.249 2021/02/15 10:13:45 martin 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.248 2021/02/14 20:58:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.249 2021/02/15 10:13:45 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -538,7 +538,7 @@ _icmp6_input(struct mbuf *m, int off, in
* Enforce alignment requirements that are violated in
* some cases, see kern/50766 for details.
*/
- if (POINTER_ALIGNED_P(icmp6, ICMP6_HDR_ALIGNMENT) == 0) {
+ if (POINTER_ALIGNED_P(icmp6, IP6_HDR_ALIGNMENT) == 0) {
m = m_copyup(m, off + sizeof(struct icmp6_hdr), 0);
if (m == NULL) {
ICMP6_STATINC(ICMP6_STAT_TOOSHORT);
@@ -548,7 +548,7 @@ _icmp6_input(struct mbuf *m, int off, in
ip6 = mtod(m, struct ip6_hdr *);
icmp6 = (struct icmp6_hdr *)(mtod(m, char *) + off);
}
- KASSERT(POINTER_ALIGNED_P(icmp6, ICMP6_HDR_ALIGNMENT));
+ KASSERT(POINTER_ALIGNED_P(icmp6, IP6_HDR_ALIGNMENT));
/*
* calculate the checksum
