Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet6 Fix the build.



details:   https://anonhg.NetBSD.org/src/rev/2c7d73bf7e03
branches:  trunk
changeset: 980696:2c7d73bf7e03
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Feb 15 10:13:45 2021 +0000

description:
Fix the build.
Maybe there should be a ICMP6_HDR_ALIGNMENT, but for now there is
only IP6_HDR_ALIGNMENT.

diffstat:

 sys/netinet6/icmp6.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 90b0a8e454e1 -r 2c7d73bf7e03 sys/netinet6/icmp6.c
--- a/sys/netinet6/icmp6.c      Mon Feb 15 09:29:56 2021 +0000
+++ b/sys/netinet6/icmp6.c      Mon Feb 15 10:13:45 2021 +0000
@@ -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 @@
         * 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 @@
                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



Home | Main Index | Thread Index | Old Index