[src/trunk]: src/sys/kern - Fix compile error for kernel configuration file w...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a06a7202b2a7
branches:  trunk
changeset: 324188:a06a7202b2a7
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Jul 18 07:06:40 2018 +0000

description:
- Fix compile error for kernel configuration file which has no any Ethernet
  device driver.
- Add missing default label.
- Fix NetBSD RCS Id.

diffstat:

 sys/kern/files.kern       |   4 ++--
 sys/kern/uipc_mbuf.c      |  18 +++++++++++++-----
 sys/kern/uipc_mbufdebug.c |   4 ++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diffs (102 lines):

diff -r 65354e99e1a8 -r a06a7202b2a7 sys/kern/files.kern
--- a/sys/kern/files.kern       Wed Jul 18 06:50:48 2018 +0000
+++ b/sys/kern/files.kern       Wed Jul 18 07:06:40 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.kern,v 1.19 2018/07/17 05:52:07 msaitoh Exp $
+#      $NetBSD: files.kern,v 1.20 2018/07/18 07:06:40 msaitoh Exp $
 
 #
 # kernel sources
@@ -175,7 +175,7 @@
 file   kern/uipc_domain.c              kern
 file   kern/uipc_mbuf.c                kern
 file   kern/uipc_mbuf2.c               kern
-file   kern/uipc_mbufdebug.c           kern
+file   kern/uipc_mbufdebug.c           kern & ether
 file   net/link_proto.c                kern    # XXX
 file   kern/uipc_proto.c               kern
 file   kern/uipc_sem.c                 kern
diff -r 65354e99e1a8 -r a06a7202b2a7 sys/kern/uipc_mbuf.c
--- a/sys/kern/uipc_mbuf.c      Wed Jul 18 06:50:48 2018 +0000
+++ b/sys/kern/uipc_mbuf.c      Wed Jul 18 07:06:40 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_mbuf.c,v 1.216 2018/07/17 05:52:07 msaitoh Exp $  */
+/*     $NetBSD: uipc_mbuf.c,v 1.217 2018/07/18 07:06:40 msaitoh Exp $  */
 
 /*
  * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,12 +62,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.216 2018/07/17 05:52:07 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.217 2018/07/18 07:06:40 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mbuftrace.h"
 #include "opt_nmbclusters.h"
 #include "opt_ddb.h"
+#include "ether.h"
 #endif
 
 #include <sys/param.h>
@@ -1646,10 +1647,12 @@
 m_print(const struct mbuf *m, const char *modif, void (*pr)(const char *, ...))
 {
        char ch;
-       const struct mbuf *m0 = NULL;
        bool opt_c = false;
        bool opt_d = false;
+#if NETHER > 0
        bool opt_v = false;
+       const struct mbuf *m0 = NULL;
+#endif
        int no = 0;
        char buf[512];
 
@@ -1661,10 +1664,14 @@
                case 'd':
                        opt_d = true;
                        break;
+#if NETHER > 0
                case 'v':
                        opt_v = true;
                        m0 = m;
                        break;
+#endif
+               default:
+                       break;
                }
        }
 
@@ -1727,9 +1734,10 @@
                }
        }
 
-       if (opt_v && m0) {
+#if NETHER > 0
+       if (opt_v && m0)
                m_examine(m0, AF_ETHER, modif, pr);
-       }
+#endif
 }
 #endif /* defined(DDB) */
 
diff -r 65354e99e1a8 -r a06a7202b2a7 sys/kern/uipc_mbufdebug.c
--- a/sys/kern/uipc_mbufdebug.c Wed Jul 18 06:50:48 2018 +0000
+++ b/sys/kern/uipc_mbufdebug.c Wed Jul 18 07:06:40 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_mbufdebug.c,v 1.1 2018/07/17 05:52:07 msaitoh Exp $       */
+/*     $NetBSD: uipc_mbufdebug.c,v 1.2 2018/07/18 07:06:40 msaitoh Exp $       */
 
 /*
  * Copyright (C) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$SEIL: uipc_mbufseil.c$");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbufdebug.c,v 1.2 2018/07/18 07:06:40 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>