[src/trunk]: src/sys/net/npf - avoid trailing , in dependencies when there ar...

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

details:   https://anonhg.NetBSD.org/src/rev/8214fe065198
branches:  trunk
changeset: 785389:8214fe065198
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Mar 11 16:37:43 2013 +0000

description:
- avoid trailing , in dependencies when there are none other the npf module
  itself.
- remove if_npflog dependency from npf_ext_log.

diffstat:

 sys/net/npf/npf.h               |  4 ++--
 sys/net/npf/npf_ext_log.c       |  6 +++---
 sys/net/npf/npf_ext_normalise.c |  6 +++---
 sys/net/npf/npf_ext_rndblock.c  |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diffs (99 lines):

diff -r 87df1cb1d77d -r 8214fe065198 sys/net/npf/npf.h
--- a/sys/net/npf/npf.h Mon Mar 11 15:53:04 2013 +0000
+++ b/sys/net/npf/npf.h Mon Mar 11 16:37:43 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf.h,v 1.27 2013/02/10 23:47:37 rmind Exp $   */
+/*     $NetBSD: npf.h,v 1.28 2013/03/11 16:37:43 christos Exp $        */
 
 /*-
  * Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
 #define        NPF_DECISION_PASS       1
 
 #define        NPF_EXT_MODULE(name, req)       \
-    MODULE(MODULE_CLASS_MISC, name, "npf," req)
+    MODULE(MODULE_CLASS_MISC, name, req ? ("npf," req) : "npf")
 
 /*
  * Packet information cache.
diff -r 87df1cb1d77d -r 8214fe065198 sys/net/npf/npf_ext_log.c
--- a/sys/net/npf/npf_ext_log.c Mon Mar 11 15:53:04 2013 +0000
+++ b/sys/net/npf/npf_ext_log.c Mon Mar 11 16:37:43 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_ext_log.c,v 1.4 2013/03/11 01:42:12 christos Exp $ */
+/*     $NetBSD: npf_ext_log.c,v 1.5 2013/03/11 16:37:43 christos Exp $ */
 
 /*-
  * Copyright (c) 2010-2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.4 2013/03/11 01:42:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.5 2013/03/11 16:37:43 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
@@ -51,7 +51,7 @@
 
 #include "npf_impl.h"
 
-NPF_EXT_MODULE(npf_ext_log, "if_npflog");
+NPF_EXT_MODULE(npf_ext_log, NULL);
 
 #define        NPFEXT_LOG_VER          1
 
diff -r 87df1cb1d77d -r 8214fe065198 sys/net/npf/npf_ext_normalise.c
--- a/sys/net/npf/npf_ext_normalise.c   Mon Mar 11 15:53:04 2013 +0000
+++ b/sys/net/npf/npf_ext_normalise.c   Mon Mar 11 16:37:43 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_ext_normalise.c,v 1.2 2012/12/24 19:05:42 rmind Exp $      */
+/*     $NetBSD: npf_ext_normalise.c,v 1.3 2013/03/11 16:37:43 christos Exp $   */
 
 /*-
  * Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_normalise.c,v 1.2 2012/12/24 19:05:42 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_normalise.c,v 1.3 2013/03/11 16:37:43 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
@@ -44,7 +44,7 @@
 /*
  * NPF extension module definition and the identifier.
  */
-NPF_EXT_MODULE(npf_ext_normalise, "");
+NPF_EXT_MODULE(npf_ext_normalise, NULL);
 
 #define        NPFEXT_NORMALISE_VER    1
 
diff -r 87df1cb1d77d -r 8214fe065198 sys/net/npf/npf_ext_rndblock.c
--- a/sys/net/npf/npf_ext_rndblock.c    Mon Mar 11 15:53:04 2013 +0000
+++ b/sys/net/npf/npf_ext_rndblock.c    Mon Mar 11 16:37:43 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_ext_rndblock.c,v 1.1 2012/12/10 00:32:23 rmind Exp $       */
+/*     $NetBSD: npf_ext_rndblock.c,v 1.2 2013/03/11 16:37:43 christos Exp $    */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_rndblock.c,v 1.1 2012/12/10 00:32:23 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_rndblock.c,v 1.2 2013/03/11 16:37:43 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/cprng.h>
@@ -45,7 +45,7 @@
 /*
  * NPF extension module definition and the identifier.
  */
-NPF_EXT_MODULE(npf_ext_rndblock, "");
+NPF_EXT_MODULE(npf_ext_rndblock, NULL);
 
 #define        NPFEXT_RNDBLOCK_VER             1