Source-Changes-HG archive

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

[src/trunk]: src/sys/net/npf Ah, fix compilation. I tested my previous change...



details:   https://anonhg.NetBSD.org/src/rev/bc7b8657e71b
branches:  trunk
changeset: 321553:bc7b8657e71b
user:      maxv <maxv%NetBSD.org@localhost>
date:      Thu Mar 22 12:16:11 2018 +0000

description:
Ah, fix compilation. I tested my previous change by loading the kernel
module from the filesystem, but the Makefile didn't have DIAGNOSTIC
enabled, and the two KASSERTs I added did not compile properly.

diffstat:

 sys/net/npf/npf_alg_icmp.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 3c9c1dfd1819 -r bc7b8657e71b sys/net/npf/npf_alg_icmp.c
--- a/sys/net/npf/npf_alg_icmp.c        Thu Mar 22 09:21:24 2018 +0000
+++ b/sys/net/npf/npf_alg_icmp.c        Thu Mar 22 12:16:11 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_alg_icmp.c,v 1.28 2018/03/22 08:57:47 maxv Exp $   */
+/*     $NetBSD: npf_alg_icmp.c,v 1.29 2018/03/22 12:16:11 maxv Exp $   */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_alg_icmp.c,v 1.28 2018/03/22 08:57:47 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_alg_icmp.c,v 1.29 2018/03/22 12:16:11 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/module.h>
@@ -252,7 +252,7 @@
         * modified, so no need to recache npc.
         */
        if (npf_iscached(npc, NPC_ICMP_ID)) {
-               KASSERT(!nbuf_flag_p(nbuf, NBUF_DATAREF_RESET));
+               KASSERT(!nbuf_flag_p(npc->npc_nbuf, NBUF_DATAREF_RESET));
                return NULL;
        }
 
@@ -341,7 +341,7 @@
         * modified, so no need to recache npc.
         */
        if (npf_iscached(npc, NPC_ICMP_ID)) {
-               KASSERT(!nbuf_flag_p(nbuf, NBUF_DATAREF_RESET));
+               KASSERT(!nbuf_flag_p(npc->npc_nbuf, NBUF_DATAREF_RESET));
                return false;
        }
 



Home | Main Index | Thread Index | Old Index